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:
@@ -1,6 +1,6 @@
|
||||
RefreshScreen::
|
||||
call ClearWindowData
|
||||
ld a, [hROMBank]
|
||||
ldh a, [hROMBank]
|
||||
push af
|
||||
ld a, BANK(ReanchorBGMap_NoOAMUpdate) ; and BANK(LoadFonts_NoOAMUpdate)
|
||||
rst Bankswitch
|
||||
@@ -14,15 +14,15 @@ RefreshScreen::
|
||||
ret
|
||||
|
||||
CloseText::
|
||||
ld a, [hOAMUpdate]
|
||||
ldh a, [hOAMUpdate]
|
||||
push af
|
||||
ld a, $1
|
||||
ld [hOAMUpdate], a
|
||||
ldh [hOAMUpdate], a
|
||||
|
||||
call .CloseText
|
||||
|
||||
pop af
|
||||
ld [hOAMUpdate], a
|
||||
ldh [hOAMUpdate], a
|
||||
ld hl, wVramState
|
||||
res 6, [hl]
|
||||
ret
|
||||
@@ -30,14 +30,14 @@ CloseText::
|
||||
.CloseText:
|
||||
call ClearWindowData
|
||||
xor a
|
||||
ld [hBGMapMode], a
|
||||
ldh [hBGMapMode], a
|
||||
call OverworldTextModeSwitch
|
||||
call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
|
||||
xor a
|
||||
ld [hBGMapMode], a
|
||||
ldh [hBGMapMode], a
|
||||
call SafeUpdateSprites
|
||||
ld a, $90
|
||||
ld [hWY], a
|
||||
ldh [hWY], a
|
||||
call ReplaceKrisSprite
|
||||
farcall ReturnFromMapSetupScript
|
||||
farcall LoadOverworldFont
|
||||
@@ -45,7 +45,7 @@ CloseText::
|
||||
|
||||
OpenText::
|
||||
call ClearWindowData
|
||||
ld a, [hROMBank]
|
||||
ldh a, [hROMBank]
|
||||
push af
|
||||
ld a, BANK(ReanchorBGMap_NoOAMUpdate) ; and BANK(LoadFonts_NoOAMUpdate)
|
||||
rst Bankswitch
|
||||
@@ -60,36 +60,36 @@ OpenText::
|
||||
ret
|
||||
|
||||
_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap::
|
||||
ld a, [hOAMUpdate]
|
||||
ldh a, [hOAMUpdate]
|
||||
push af
|
||||
ld a, $1
|
||||
ld [hOAMUpdate], a
|
||||
ldh [hOAMUpdate], a
|
||||
|
||||
farcall OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
|
||||
|
||||
pop af
|
||||
ld [hOAMUpdate], a
|
||||
ldh [hOAMUpdate], a
|
||||
ret
|
||||
|
||||
SafeUpdateSprites::
|
||||
ld a, [hOAMUpdate]
|
||||
ldh a, [hOAMUpdate]
|
||||
push af
|
||||
ld a, [hBGMapMode]
|
||||
ldh a, [hBGMapMode]
|
||||
push af
|
||||
xor a
|
||||
ld [hBGMapMode], a
|
||||
ldh [hBGMapMode], a
|
||||
ld a, $1
|
||||
ld [hOAMUpdate], a
|
||||
ldh [hOAMUpdate], a
|
||||
|
||||
call UpdateSprites
|
||||
|
||||
xor a
|
||||
ld [hOAMUpdate], a
|
||||
ldh [hOAMUpdate], a
|
||||
call DelayFrame
|
||||
pop af
|
||||
ld [hBGMapMode], a
|
||||
ldh [hBGMapMode], a
|
||||
pop af
|
||||
ld [hOAMUpdate], a
|
||||
ldh [hOAMUpdate], a
|
||||
ret
|
||||
|
||||
; unused
|
||||
|
Reference in New Issue
Block a user