diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2018-08-25 22:23:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-25 22:23:45 -0400 |
| commit | 3eacab563d0e1ab5557c2443556a7a5e58d14cad (patch) | |
| tree | 3d747166409fdc94f0fd1aa760693a7ee5bd2156 /home/window.asm | |
| parent | 89681d231611938a791f4256e602c88c2f9aa3e1 (diff) | |
| parent | b2adcd6d6ff91efc764a6ecc65147be7b9cda9e8 (diff) | |
Merge pull request #555 from Rangi42/ldh
Use real labels for HRAM instead of constants, and the ldh instruction
Diffstat (limited to 'home/window.asm')
| -rw-r--r-- | home/window.asm | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/home/window.asm b/home/window.asm index 6d9bd5311..ff0576e63 100644 --- a/home/window.asm +++ b/home/window.asm @@ -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 |