Use labels instead of constants for HRAM

Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
This commit is contained in:
Rangi
2018-08-25 14:28:22 -04:00
parent 376c64468b
commit eb1e3636bb
243 changed files with 4706 additions and 4661 deletions

View File

@@ -18,7 +18,7 @@ HealMachineAnim:
; 2: Up (Hall of Fame)
ld a, [wScriptVar]
ld [wBuffer1], a
ld a, [rOBP1]
ldh a, [rOBP1]
ld [wBuffer2], a
call .DoJumptableFunctions
ld a, [wBuffer2]
@@ -158,7 +158,7 @@ INCBIN "gfx/overworld/heal_machine.2bpp"
call IsCGB
jr nz, .cgb
ld a, %11100000
ld [rOBP1], a
ldh [rOBP1], a
ret
.cgb
@@ -168,7 +168,7 @@ INCBIN "gfx/overworld/heal_machine.2bpp"
ld a, BANK(wOBPals2)
call FarCopyWRAM
ld a, $1
ld [hCGBPalUpdate], a
ldh [hCGBPalUpdate], a
ret
.palettes
@@ -189,16 +189,16 @@ INCLUDE "gfx/overworld/heal_machine.pal"
.FlashPalettes:
call IsCGB
jr nz, .go
ld a, [rOBP1]
ldh a, [rOBP1]
xor %00101000
ld [rOBP1], a
ldh [rOBP1], a
ret
.go
ld a, [rSVBK]
ldh a, [rSVBK]
push af
ld a, BANK(wOBPals2)
ld [rSVBK], a
ldh [rSVBK], a
ld hl, wOBPals2 palette PAL_OW_TREE
ld a, [hli]
@@ -230,9 +230,9 @@ INCLUDE "gfx/overworld/heal_machine.pal"
ld [hl], a
pop af
ld [rSVBK], a
ldh [rSVBK], a
ld a, $1
ld [hCGBPalUpdate], a
ldh [hCGBPalUpdate], a
ret
.PlaceHealingMachineTile: