Improve some innacurate function names, labels, and comments (#1078)
[https://github.com/pret/pokecrystal/issues/1078#issue-1869550979 and https://github.com/pret/pokecrystal/issues/1078#issuecomment-1696394371]
This commit is contained in:
18
home/map.asm
18
home/map.asm
@@ -91,12 +91,12 @@ GetMapSceneID::
|
||||
pop bc
|
||||
ret
|
||||
|
||||
OverworldTextModeSwitch::
|
||||
call LoadMapPart
|
||||
call SwapTextboxPalettes
|
||||
LoadOverworldTilemapAndAttrmapPals::
|
||||
call LoadOverworldTilemap
|
||||
call LoadOverworldAttrmapPals
|
||||
ret
|
||||
|
||||
LoadMapPart::
|
||||
LoadOverworldTilemap::
|
||||
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(_LoadOverworldTilemap)
|
||||
rst Bankswitch
|
||||
call _LoadMapPart
|
||||
call _LoadOverworldTilemap
|
||||
|
||||
pop af
|
||||
rst Bankswitch
|
||||
@@ -1911,7 +1911,7 @@ FadeToMenu::
|
||||
xor a
|
||||
ldh [hBGMapMode], a
|
||||
call LoadStandardMenuHeader
|
||||
farcall FadeOutPalettes
|
||||
farcall FadeOutToWhite
|
||||
call ClearSprites
|
||||
call DisableSpriteUpdates
|
||||
ret
|
||||
@@ -1935,7 +1935,7 @@ FinishExitMenu::
|
||||
call GetSGBLayout
|
||||
farcall LoadOW_BGPal7
|
||||
call WaitBGMap2
|
||||
farcall FadeInPalettes
|
||||
farcall FadeInFromWhite
|
||||
call EnableSpriteUpdates
|
||||
ret
|
||||
|
||||
@@ -1977,7 +1977,7 @@ ReloadTilesetAndPalettes::
|
||||
ld c, a
|
||||
call SwitchToAnyMapAttributesBank
|
||||
farcall UpdateTimeOfDayPal
|
||||
call OverworldTextModeSwitch
|
||||
call LoadOverworldTilemapAndAttrmapPals
|
||||
call LoadTilesetGFX
|
||||
ld a, 9
|
||||
call SkipMusic
|
||||
|
@@ -324,8 +324,8 @@ ReloadSpritesNoPalettes::
|
||||
call DelayFrame
|
||||
ret
|
||||
|
||||
SwapTextboxPalettes::
|
||||
homecall _SwapTextboxPalettes
|
||||
LoadOverworldAttrmapPals::
|
||||
homecall _LoadOverworldAttrmapPals
|
||||
ret
|
||||
|
||||
ScrollBGMapPalettes::
|
||||
|
@@ -15,7 +15,7 @@ PrintLetterDelay::
|
||||
|
||||
; non-scrolling text?
|
||||
ld a, [wTextboxFlags]
|
||||
bit NO_TEXT_DELAY_F, a
|
||||
bit TEXT_DELAY_F, a
|
||||
ret z
|
||||
|
||||
push hl
|
||||
|
@@ -20,7 +20,7 @@ ScrollingMenu::
|
||||
ld hl, wVramState
|
||||
bit 0, [hl]
|
||||
jp nz, UpdateTimePals
|
||||
jp SetPalettes
|
||||
jp SetDefaultBGPAndOBP
|
||||
|
||||
InitScrollingMenu::
|
||||
ld a, [wMenuBorderTopCoord]
|
||||
|
@@ -661,7 +661,7 @@ PokeFluteTerminator::
|
||||
PlaceHLTextAtBC::
|
||||
ld a, [wTextboxFlags]
|
||||
push af
|
||||
set NO_TEXT_DELAY_F, a
|
||||
set TEXT_DELAY_F, a
|
||||
ld [wTextboxFlags], a
|
||||
|
||||
call DoTextUntilTerminator
|
||||
|
@@ -143,12 +143,12 @@ endr
|
||||
ld sp, hl
|
||||
ret
|
||||
|
||||
SetPalettes::
|
||||
SetDefaultBGPAndOBP::
|
||||
; Inits the Palettes
|
||||
; depending on the system the monochromes palettes or color palettes
|
||||
ldh a, [hCGB]
|
||||
and a
|
||||
jr nz, .SetPalettesForGameBoyColor
|
||||
jr nz, .SetDefaultBGPAndOBPForGameBoyColor
|
||||
ld a, %11100100
|
||||
ldh [rBGP], a
|
||||
ld a, %11010000
|
||||
@@ -156,7 +156,7 @@ SetPalettes::
|
||||
ldh [rOBP1], a
|
||||
ret
|
||||
|
||||
.SetPalettesForGameBoyColor:
|
||||
.SetDefaultBGPAndOBPForGameBoyColor:
|
||||
push de
|
||||
ld a, %11100100
|
||||
call DmgToCgbBGPals
|
||||
|
@@ -6,7 +6,7 @@ RefreshScreen::
|
||||
rst Bankswitch
|
||||
|
||||
call ReanchorBGMap_NoOAMUpdate
|
||||
call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
|
||||
call HDMATransferTilemapAndAttrmap_Menu
|
||||
call LoadFonts_NoOAMUpdate
|
||||
|
||||
pop af
|
||||
@@ -31,8 +31,8 @@ CloseText::
|
||||
call ClearWindowData
|
||||
xor a
|
||||
ldh [hBGMapMode], a
|
||||
call OverworldTextModeSwitch
|
||||
call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
|
||||
call LoadOverworldTilemapAndAttrmapPals
|
||||
call HDMATransferTilemapAndAttrmap_Menu
|
||||
xor a
|
||||
ldh [hBGMapMode], a
|
||||
call SafeUpdateSprites
|
||||
@@ -50,22 +50,22 @@ OpenText::
|
||||
ld a, BANK(ReanchorBGMap_NoOAMUpdate) ; aka BANK(LoadFonts_NoOAMUpdate)
|
||||
rst Bankswitch
|
||||
|
||||
call ReanchorBGMap_NoOAMUpdate ; clear bgmap
|
||||
call ReanchorBGMap_NoOAMUpdate ; anchor bgmap
|
||||
call SpeechTextbox
|
||||
call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap ; anchor bgmap
|
||||
call HDMATransferTilemapAndAttrmap_Menu ; transfer bgmap
|
||||
call LoadFonts_NoOAMUpdate ; load font
|
||||
pop af
|
||||
rst Bankswitch
|
||||
|
||||
ret
|
||||
|
||||
_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap::
|
||||
HDMATransferTilemapAndAttrmap_Menu::
|
||||
ldh a, [hOAMUpdate]
|
||||
push af
|
||||
ld a, $1
|
||||
ldh [hOAMUpdate], a
|
||||
|
||||
farcall OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
|
||||
farcall _HDMATransferTilemapAndAttrmap_Menu
|
||||
|
||||
pop af
|
||||
ldh [hOAMUpdate], a
|
||||
|
Reference in New Issue
Block a user