Improve some innacurate function names from pokecrystal

This commit is contained in:
xCrystal
2023-08-28 13:30:13 +02:00
parent 11db1300b2
commit fd6f02036e
18 changed files with 76 additions and 63 deletions

View File

@@ -91,12 +91,12 @@ GetMapSceneID::
pop bc
ret
OverworldTextModeSwitch::
call LoadMapPart
call SwapTextboxPalettes
LoadScreenTilemapAndAttrmapPals::
call LoadScreenTilemap
call LoadScreenAttrmapPals
ret
LoadMapPart::
LoadScreenTilemap::
ldh a, [hROMBank]
push af
@@ -109,9 +109,9 @@ LoadMapPart::
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call ByteFill
ld a, BANK(_LoadMapPart)
ld a, BANK(_LoadScreenTilemap)
rst Bankswitch
call _LoadMapPart
call _LoadScreenTilemap
pop af
rst Bankswitch
@@ -1952,7 +1952,7 @@ ReloadTilesetAndPalettes::
ld c, a
call SwitchToAnyMapAttributesBank
farcall UpdateTimeOfDayPal
call OverworldTextModeSwitch
call LoadScreenTilemapAndAttrmapPals
call LoadTilesetGFX
ld a, 9
call SkipMusic

View File

@@ -288,8 +288,8 @@ ReloadSpritesNoPalettes::
call DelayFrame
ret
SwapTextboxPalettes::
homecall _SwapTextboxPalettes
LoadScreenAttrmapPals::
homecall _LoadScreenAttrmapPals
ret
ScrollBGMapPalettes::

View File

@@ -6,7 +6,7 @@ RefreshScreen::
rst Bankswitch
call ReanchorBGMap_NoOAMUpdate
call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
call HDMATransferTilemapAndAttrmap_OpenAndCloseMenu
call HideWindow_EnableLCDInt
pop af
@@ -22,8 +22,8 @@ CloseText::
call ClearMenuAndWindowData
xor a
ldh [hBGMapMode], a
call OverworldTextModeSwitch
call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
call LoadScreenTilemapAndAttrmapPals
call HDMATransferTilemapAndAttrmap_OpenAndCloseMenu
xor a
ldh [hBGMapMode], a
call SafeUpdateSprites
@@ -46,10 +46,10 @@ OpenText2bpp::
ld a, BANK(ReanchorBGMap_NoOAMUpdate)
rst Bankswitch
; assumes that the overworld 2bpp font and frame are loaded when calling this
call ReanchorBGMap_NoOAMUpdate ; clear bgmap
; assumes that the overworld 2bpp font and frame are loaded when calling this
call ReanchorBGMap_NoOAMUpdate ; anchor bgmap
call SpeechTextbox2bpp
call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap ; anchor bgmap
call HDMATransferTilemapAndAttrmap_OpenAndCloseMenu ; transfer bgmap
call HideWindow_EnableLCDInt
pop af
@@ -64,9 +64,9 @@ OpenText1bpp::
ld a, BANK(ReanchorBGMap_NoOAMUpdate) ; aka BANK(LoadFont_NoOAMUpdate)
rst Bankswitch
call ReanchorBGMap_NoOAMUpdate ; clear bgmap
call ReanchorBGMap_NoOAMUpdate ; anchor bgmap
call SpeechTextbox1bpp
call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap ; anchor bgmap
call HDMATransferTilemapAndAttrmap_OpenAndCloseMenu ; transfer bgmap
call LoadFont_NoOAMUpdate ; load 1bpp font and frame, hide window
pop af
@@ -74,13 +74,13 @@ OpenText1bpp::
ret
_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap::
HDMATransferTilemapAndAttrmap_OpenAndCloseMenu::
ldh a, [hOAMUpdate]
push af
ld a, $1
ldh [hOAMUpdate], a
farcall OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
farcall _HDMATransferTilemapAndAttrmap_OpenAndCloseMenu
pop af
ldh [hOAMUpdate], a