Use labels instead of constants for HRAM

1 files changed, 70 insertions, 70 deletions

diff --git a/home/vblank.asm b/home/vblank.asm
index 485b875c..9c360586 100644
--- a/home/vblank.asm
+++ b/home/vblank.asm
@@ -3,7 +3,7 @@ VBlank::
 	push bc
 	push de
 	push hl
-	ld a, [hVBlank]
+	ldh a, [hVBlank]
 	and $7
 	ld e, a
 	ld d, $0
@@ -54,29 +54,29 @@ VBlank0:: ; 180
 	inc [hl]
 
 	; advance random variables
-	ld a, [rDIV]
+	ldh a, [rDIV]
 	ld b, a
-	ld a, [hRandomAdd]
+	ldh a, [hRandomAdd]
 	adc b
-	ld [hRandomAdd], a
+	ldh [hRandomAdd], a
 
-	ld a, [rDIV]
+	ldh a, [rDIV]
 	ld b, a
-	ld a, [hRandomSub]
+	ldh a, [hRandomSub]
 	sbc b
-	ld [hRandomSub], a
+	ldh [hRandomSub], a
 
-	ld a, [hROMBank]
+	ldh a, [hROMBank]
 	ld [wROMBankBackup], a
 
-	ld a, [hSCX]
-	ld [rSCX], a
-	ld a, [hSCY]
-	ld [rSCY], a
-	ld a, [hWY]
-	ld [rWY], a
-	ld a, [hWX]
-	ld [rWX], a
+	ldh a, [hSCX]
+	ldh [rSCX], a
+	ldh a, [hSCY]
+	ldh [rSCY], a
+	ldh a, [hWY]
+	ldh [rWY], a
+	ldh a, [hWX]
+	ldh [rWX], a
 
 	; There's only time to call one of these in one vblank.
 	; Calls are in order of priority.
@@ -96,10 +96,10 @@ VBlank0:: ; 180
 
 .done
 
-	ld a, [hOAMUpdate]
+	ldh a, [hOAMUpdate]
 	and a
 	jr nz, .done_oam
-	call hPushOAM
+	call hTransferVirtualOAM
 .done_oam
 
 
@@ -129,8 +129,8 @@ VBlank0:: ; 180
 	call _UpdateSound
 	ld a, [wROMBankBackup]
 	rst Bankswitch
-	ld a, [hSeconds]
-	ld [hSecondsBackup], a
+	ldh a, [hSeconds]
+	ldh [hSecondsBackup], a
 	ret
 
 VBlank1:: ; 1f4
@@ -140,21 +140,21 @@ VBlank1:: ; 1f4
 ; tiles
 ; oam
 ; sound / lcd stat
-	ld a, [hROMBank]
+	ldh a, [hROMBank]
 	ld [wROMBankBackup], a
-	ld a, [hSCX]
-	ld [rSCX], a
-	ld a, [hSCY]
-	ld [rSCY], a
+	ldh a, [hSCX]
+	ldh [rSCX], a
+	ldh a, [hSCY]
+	ldh [rSCY], a
 	call UpdatePals
 	jr c, .done
 
 	call UpdateBGMap
 	call Serve2bppRequest
 
-	call hPushOAM
+	call hTransferVirtualOAM
 .done
-	ld a, [hLCDCPointer]
+	ldh a, [hLCDCPointer]
 	or a
 	jr z, .skip_lcd
 	ld c, a
@@ -165,20 +165,20 @@ VBlank1:: ; 1f4
 	ld [wVBlankOccurred], a
 
 	; get requested ints
-	ld a, [rIF]
+	ldh a, [rIF]
 	ld b, a
 	; discard requested ints
 	xor a
-	ld [rIF], a
+	ldh [rIF], a
 	; enable lcd stat
 	ld a, %10 ; lcd stat
-	ld [rIE], a
+	ldh [rIE], a
 	; rerequest serial int if applicable (still disabled)
 	; request lcd stat
 	ld a, b
 	and %1000 ; serial
 	or %10 ; lcd stat
-	ld [rIF], a
+	ldh [rIF], a
 
 	ei
 	ld a, BANK(_UpdateSound)
@@ -188,22 +188,22 @@ VBlank1:: ; 1f4
 	rst Bankswitch
 	; enable ints
 	ld a, %11111
-	ld [rIE], a
+	ldh [rIE], a
 	ret
 
 UpdatePals:: ; 23e
 ; update pals for either dmg or cgb
-	ld a, [hCGB]
+	ldh a, [hCGB]
 	and a
 	jp nz, UpdateCGBPals
 
 	; update gb pals
 	ld a, [wBGP]
-	ld [rBGP], a
+	ldh [rBGP], a
 	ld a, [wOBP0]
-	ld [rOBP0], a
+	ldh [rOBP0], a
 	ld a, [wOPB1]
-	ld [rOBP1], a
+	ldh [rOBP1], a
 	and a
 	ret
 
@@ -215,13 +215,13 @@ VBlank4:: ; 255
 ; serial
 ; sound
 
-	ld a, [hROMBank]
+	ldh a, [hROMBank]
 	ld [wROMBankBackup], a
 
 	call UpdateBGMap
 	call Serve2bppRequest
 
-	call hPushOAM
+	call hTransferVirtualOAM
 
 	call Joypad
 
@@ -245,11 +245,11 @@ VBlank5:: ; 278
 ; tiles
 ; joypad
 
-	ld a, [hROMBank]
+	ldh a, [hROMBank]
 	ld [wROMBankBackup], a
 
-	ld a, [hSCX]
-	ld [rSCX], a
+	ldh a, [hSCX]
+	ldh [rSCX], a
 
 	call UpdatePalsIfCGB
 	jr c, .done
@@ -264,11 +264,11 @@ VBlank5:: ; 278
 	call Joypad
 
 	xor a
-	ld [rIF], a
+	ldh [rIF], a
 	ld a, %10 ; lcd stat
-	ld [rIE], a
+	ldh [rIE], a
 	; request lcd stat
-	ld [rIF], a
+	ldh [rIF], a
 
 	ei
 	ld a, BANK(_UpdateSound)
@@ -279,16 +279,16 @@ VBlank5:: ; 278
 	di
 
 	xor a
-	ld [rIF], a
+	ldh [rIF], a
 	; enable ints
 	ld a, %11111
-	ld [rIE], a
+	ldh [rIE], a
 	ret
 
 VBlank2:: ; 2b0
 ; sound only
 
-	ld a, [hROMBank]
+	ldh a, [hROMBank]
 	ld [wROMBankBackup], a
 
 	ld a, BANK(_UpdateSound)
@@ -310,36 +310,36 @@ VBlank3:: ; 2c4
 ; oam
 ; sound / lcd stat
 
-	ld a, [hVBlankCounter]
+	ldh a, [hVBlankCounter]
 	inc a
-	ld [hVBlankCounter], a
+	ldh [hVBlankCounter], a
 
-	ld a, [rDIV]
+	ldh a, [rDIV]
 	ld b, a
-	ld a, [hRandomAdd]
+	ldh a, [hRandomAdd]
 	adc b
-	ld [hRandomAdd], a
+	ldh [hRandomAdd], a
 
-	ld a, [rDIV]
+	ldh a, [rDIV]
 	ld b, a
-	ld a, [hRandomSub]
+	ldh a, [hRandomSub]
 	sbc b
-	ld [hRandomSub], a
+	ldh [hRandomSub], a
 
 	call Joypad
 
-	ld a, [hROMBank]
+	ldh a, [hROMBank]
 	ld [wROMBankBackup], a
 
-	ld a, [hSCX]
-	ld [rSCX], a
-	ld a, [hSCY]
-	ld [rSCY], a
+	ldh a, [hSCX]
+	ldh [rSCX], a
+	ldh a, [hSCY]
+	ldh [rSCY], a
 
-	ld a, [hWY]
-	ld [rWY], a
-	ld a, [hWX]
-	ld [rWX], a
+	ldh a, [hWY]
+	ldh [rWY], a
+	ldh a, [hWX]
+	ldh [rWX], a
 
 	call UpdateBGMap
 	call UpdateBGMapBuffer
@@ -349,7 +349,7 @@ VBlank3:: ; 2c4
 	call Serve1bppRequest
 	call AnimateTileset
 
-	call hPushOAM
+	call hTransferVirtualOAM
 
 	xor a
 	ld [wVBlankOccurred], a
@@ -362,11 +362,11 @@ VBlank3:: ; 2c4
 .okay
 
 	xor a
-	ld [rIF], a
+	ldh [rIF], a
 	ld a, %10 ; lcd stat
-	ld [rIE], a
+	ldh [rIE], a
 	; request lcd stat
-	ld [rIF], a
+	ldh [rIF], a
 
 	ei
 	ld a, BANK(_UpdateSound)
@@ -377,8 +377,8 @@ VBlank3:: ; 2c4
 	di
 
 	xor a
-	ld [rIF], a
+	ldh [rIF], a
 	; enable ints 
 	ld a, %11111
-	ld [rIE], a
+	ldh [rIE], a
 	ret