OAM improvements

dreams897 · Jun 19, 2023 · ab04d13 · ab04d13
1 parent b8c4f01
commit ab04d13
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/home/update_sprites.asm b/home/update_sprites.asm
@@ -2,5 +2,9 @@ UpdateSprites::
 	ld a, [wUpdateSpritesEnabled]
 	dec a
 	ret nz
+	ld hl, hSkipOAMUpdates
+	set 0, [hl]
 	homecall _UpdateSprites
+	ld hl, hSkipOAMUpdates
+	res 0, [hl]
 	ret
diff --git a/home/vblank.asm b/home/vblank.asm
@@ -25,7 +25,10 @@ VBlank::
 	call RedrawRowOrColumn
 	call VBlankCopy
 	call VBlankCopyDouble
-	;call UpdateMovingBgTiles
+       ;call UpdateMovingBgTiles
+	ld a, [hSkipOAMUpdates]
+	bit 0, a
+	jr nz, .skipOAM
 	call hDMARoutine
 	rst $10 ; HAX: VBlank hook (loads palettes)
 	nop
@@ -42,6 +45,7 @@ VBlank::
 	nop
 	nop
 	;call PrepareOAMData
+.skipOAM
 	nop
 	nop
 	nop

diff --git a/ram/hram.asm b/ram/hram.asm
@@ -387,7 +387,7 @@ hWhoseTurn:: db ; 0 on player's turn, 1 on enemy's turn
 
 hClearLetterPrintingDelayFlags:: db
 
-	ds 1
+hSkipOAMUpdates:: db
 
 ; bit 0: draw HP fraction to the right of bar instead of below (for party menu)
 ; bit 1: menu is double spaced