GFX->Gfx and new push_oam.asm

ElectroDeoxys · Jul 30, 2024 · b419dbc · b419dbc
1 parent 6739b46
commit b419dbc
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 15 deletions.
diff --git a/src/gfx.asm b/src/gfx.asm
@@ -304,7 +304,7 @@ SECTION "Level Palettes", ROMX
 INCLUDE "data/levels/palettes.asm"
 
 
-SECTION "Animated Tile GFX", ROMX
+SECTION "Animated Tile Gfx", ROMX
 
 AnimatedTilesGfx::
 AnimatedTiles1Gfx::  INCBIN "gfx/levels/animated/animated_tiles1.2bpp"  ; ANIMATED_TILES_GFX_00
@@ -333,7 +333,7 @@ AnimatedTiles23Gfx:: INCBIN "gfx/levels/animated/animated_tiles23.2bpp" ; ANIMAT
 AnimatedTiles24Gfx:: INCBIN "gfx/levels/animated/animated_tiles24.2bpp" ; ANIMATED_TILES_GFX_23
 
 
-SECTION "Hidden Figure GFX", ROMX
+SECTION "Hidden Figure Gfx", ROMX
 
 HiddenFigure1Gfx:: INCBIN "gfx/enemies/hidden_figure1.2bpp"
 HiddenFigure2Gfx:: INCBIN "gfx/enemies/hidden_figure2.2bpp"

diff --git a/src/home.asm b/src/home.asm
@@ -7,6 +7,7 @@ INCLUDE "home/dpad_repeat.asm"
 INCLUDE "home/vblank.asm"
 INCLUDE "home/clear_memory.asm"
 INCLUDE "home/joypad.asm"
+INCLUDE "home/push_oam.asm"
 INCLUDE "home/copy.asm"
 INCLUDE "home/fade.asm"
 INCLUDE "home/disable_lcd.asm"

diff --git a/src/home/door_transition.asm b/src/home/door_transition.asm
@@ -32,7 +32,7 @@ DoorTransition::
 	xor $1
 	ld [w3d506], a
 	jr z, .asm_96d
-	call Func_9a3
+	call .Func_9a3
 	jr .done
 .asm_96d
 	ld hl, wPalFadeCounter
@@ -58,7 +58,7 @@ DoorTransition::
 	inc [hl]
 	jr .done
 
-Func_9a3::
+.Func_9a3:
 	ld a, [wPalFadeCounter]
 	cp $10
 	ret nc

diff --git a/src/home/fade.asm b/src/home/fade.asm
@@ -864,8 +864,10 @@ VBlank_8bf::
 	ldh [rSCY], a
 	ld a, [wSCX]
 	ldh [rSCX], a
+
 	call LoadBGPalettesFromWRAM
 	call LoadOBPalettesFromWRAM
+
 	ld a, HIGH(wVirtualOAM)
 	call hTransferVirtualOAM
 	ret
diff --git a/src/home/joypad.asm b/src/home/joypad.asm
@@ -50,12 +50,3 @@ ENDR
 	ld a, P1F_GET_NONE
 	ldh [rP1], a
 	ret
-
-PushOAM::
-	ldh [rDMA], a ; start DMA transfer (starts right after instruction)
-	ld a, 160 / (1 + 3) ; delay for a total of 160 cycles
-.loop
-	dec a        ; 1 cycle
-	jr nz, .loop ; 3 cycles
-	ret
-.end
diff --git a/src/home/push_oam.asm b/src/home/push_oam.asm
@@ -0,0 +1,8 @@
+PushOAM::
+	ldh [rDMA], a ; start DMA transfer (starts right after instruction)
+	ld a, 160 / (1 + 3) ; delay for a total of 160 cycles
+.loop
+	dec a        ; 1 cycle
+	jr nz, .loop ; 3 cycles
+	ret
+.end
diff --git a/src/layout.link b/src/layout.link
@@ -150,11 +150,11 @@ ROMX $33
 	"Level Palettes"
 ROMX $34
 	"Update Animated Tiles"
-	"Animated Tile GFX"
+	"Animated Tile Gfx"
 ROMX $35
 	"Clear Level"
 ROMX $36
-	"Hidden Figure GFX"
+	"Hidden Figure Gfx"
 	"Game Over"
 ROMX $37
 	"Perfect"