diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/map_objects.asm | 2 | ||||
| -rw-r--r-- | home/window.asm | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/home/map_objects.asm b/home/map_objects.asm index b3e544aac..f64ebd8ab 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -636,7 +636,7 @@ GetObjectStruct:: ; 1ae5 ret ; 1af1 -GetObjectSprite:: ; 1af1 +DoesObjectHaveASprite:: ; 1af1 ld hl, OBJECT_SPRITE add hl, bc ld a, [hl] diff --git a/home/window.asm b/home/window.asm index d000b7fdd..5922905a9 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,7 +36,7 @@ CloseText:: ; 2dcf xor a ld [hBGMapMode], a call OverworldTextModeSwitch - call Function2e20 + call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap xor a ld [hBGMapMode], a call Function2e31 @@ -52,26 +52,26 @@ 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 |