diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2016-07-21 07:58:36 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2016-07-21 07:58:36 -0400 |
| commit | 803c6081d7b458f1965c4b9e62be2714b73fcdf4 (patch) | |
| tree | 94632a90406f3b185d82cabee2beb834bd711215 /home/window.asm | |
| parent | c33ba049a5a993fc678fd1698645039ce4974022 (diff) | |
| parent | a32b6ccbb5b9ad15befa3b9893659f2ceabd1ba0 (diff) | |
Merge github.com:pikalaxalt/pokecrystal
Diffstat (limited to 'home/window.asm')
| -rw-r--r-- | home/window.asm | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/home/window.asm b/home/window.asm index d000b7fdd..ff7d766e2 100644 --- a/home/window.asm +++ b/home/window.asm @@ -3,12 +3,12 @@ RefreshScreen:: ; 2dba call ClearWindowData ld a, [hROMBank] push af - ld a, BANK(Function6454) ; and BANK(Function64bf) + ld a, BANK(ReanchorBGMap_NoOAMUpdate) ; and BANK(LoadFonts_NoOAMUpdate) rst Bankswitch - call Function6454 - call Function2e20 - call Function64bf + call ReanchorBGMap_NoOAMUpdate + call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap + call LoadFonts_NoOAMUpdate pop af rst Bankswitch @@ -36,10 +36,10 @@ CloseText:: ; 2dcf xor a ld [hBGMapMode], a call OverworldTextModeSwitch - call Function2e20 + call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap xor a ld [hBGMapMode], a - call Function2e31 + call SafeUpdateSprites ld a, $90 ld [hWY], a call ReplaceKrisSprite @@ -52,33 +52,33 @@ OpenText:: ; 2e08 call ClearWindowData ld a, [hROMBank] push af - ld a, BANK(Function6454) ; and BANK(Function64bf) + ld a, BANK(ReanchorBGMap_NoOAMUpdate) ; and BANK(LoadFonts_NoOAMUpdate) rst Bankswitch - call Function6454 ; clear bgmap + call ReanchorBGMap_NoOAMUpdate ; clear bgmap call SpeechTextBox - call Function2e20 ; anchor bgmap - call Function64bf ; load font + call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap ; anchor bgmap + call LoadFonts_NoOAMUpdate ; load font pop af rst Bankswitch ret ; 2e20 -Function2e20:: ; 2e20 +_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap:: ; 2e20 ld a, [hOAMUpdate] push af ld a, $1 ld [hOAMUpdate], a - callba Function104110 + callba OpenAndCloseMenu_HDMATransferTileMapAndAttrMap pop af ld [hOAMUpdate], a ret ; 2e31 -Function2e31:: ; 2e31 +SafeUpdateSprites:: ; 2e31 ld a, [hOAMUpdate] push af ld a, [hBGMapMode] @@ -87,7 +87,9 @@ Function2e31:: ; 2e31 ld [hBGMapMode], a ld a, $1 ld [hOAMUpdate], a + call UpdateSprites + xor a ld [hOAMUpdate], a call DelayFrame @@ -96,4 +98,8 @@ Function2e31:: ; 2e31 pop af ld [hOAMUpdate], a ret -; 2e4e + +; XXX + scf + ret +; 2e50 |