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:
@@ -608,7 +608,7 @@ Function1704e1:
|
||||
bit 7, a
|
||||
jr nz, .done
|
||||
call .DoJumptable
|
||||
farcall ReloadMapPart
|
||||
farcall HDMATransferTilemapAndAttrmap_Overworld
|
||||
jr .loop
|
||||
|
||||
.done
|
||||
@@ -654,7 +654,7 @@ Function1704e1:
|
||||
jr .NextJumptableFunction
|
||||
|
||||
.Jumptable_1:
|
||||
call SetPalettes
|
||||
call SetDefaultBGPAndOBP
|
||||
call .NextJumptableFunction
|
||||
|
||||
.Jumptable_2:
|
||||
|
@@ -76,7 +76,7 @@ DisplayCaughtContestMonStats:
|
||||
call WaitBGMap
|
||||
ld b, SCGB_DIPLOMA
|
||||
call GetSGBLayout
|
||||
call SetPalettes
|
||||
call SetDefaultBGPAndOBP
|
||||
ret
|
||||
|
||||
.Health:
|
||||
|
@@ -31,7 +31,7 @@ PlaceDiplomaOnScreen:
|
||||
call WaitBGMap
|
||||
ld b, SCGB_DIPLOMA
|
||||
call GetSGBLayout
|
||||
call SetPalettes
|
||||
call SetDefaultBGPAndOBP
|
||||
call DelayFrame
|
||||
ret
|
||||
|
||||
|
@@ -10,7 +10,7 @@ PlayWhirlpoolSound:
|
||||
ret
|
||||
|
||||
BlindingFlash:
|
||||
farcall FadeOutPalettes
|
||||
farcall FadeOutToWhite
|
||||
ld hl, wStatusFlags
|
||||
set STATUSFLAGS_FLASH_F, [hl]
|
||||
farcall ReplaceTimeOfDayPals
|
||||
@@ -18,7 +18,7 @@ BlindingFlash:
|
||||
ld b, SCGB_MAPPALS
|
||||
call GetSGBLayout
|
||||
farcall LoadOW_BGPal7
|
||||
farcall FadeInPalettes
|
||||
farcall FadeInFromWhite
|
||||
ret
|
||||
|
||||
ShakeHeadbuttTree:
|
||||
@@ -59,7 +59,7 @@ ShakeHeadbuttTree:
|
||||
jr .loop
|
||||
|
||||
.done
|
||||
call OverworldTextModeSwitch
|
||||
call LoadOverworldTilemapAndAttrmapPals
|
||||
call WaitBGMap
|
||||
xor a
|
||||
ldh [hBGMapMode], a
|
||||
|
@@ -41,7 +41,7 @@ RedCredits::
|
||||
ld [wMusicFadeID + 1], a
|
||||
ld a, 10
|
||||
ld [wMusicFade], a
|
||||
farcall FadeOutPalettes
|
||||
farcall FadeOutToWhite
|
||||
xor a
|
||||
ld [wVramState], a
|
||||
ldh [hMapAnims], a
|
||||
@@ -63,7 +63,7 @@ HallOfFame_FadeOutMusic:
|
||||
ld [wMusicFadeID + 1], a
|
||||
ld a, 10
|
||||
ld [wMusicFade], a
|
||||
farcall FadeOutPalettes
|
||||
farcall FadeOutToWhite
|
||||
xor a
|
||||
ld [wVramState], a
|
||||
ldh [hMapAnims], a
|
||||
@@ -256,7 +256,7 @@ AnimateHOFMonEntrance:
|
||||
ldh [hBGMapMode], a
|
||||
ld b, SCGB_PLAYER_OR_MON_FRONTPIC_PALS
|
||||
call GetSGBLayout
|
||||
call SetPalettes
|
||||
call SetDefaultBGPAndOBP
|
||||
call HOF_SlideBackpic
|
||||
xor a
|
||||
ld [wBoxAlignment], a
|
||||
@@ -389,7 +389,7 @@ _HallOfFamePC:
|
||||
call WaitBGMap
|
||||
ld b, SCGB_PLAYER_OR_MON_FRONTPIC_PALS
|
||||
call GetSGBLayout
|
||||
call SetPalettes
|
||||
call SetDefaultBGPAndOBP
|
||||
decoord 6, 5
|
||||
ld c, ANIM_MON_HOF
|
||||
predef HOF_AnimateFrontpic
|
||||
@@ -543,7 +543,7 @@ HOF_AnimatePlayerPic:
|
||||
ld [wCurPartySpecies], a
|
||||
ld b, SCGB_PLAYER_OR_MON_FRONTPIC_PALS
|
||||
call GetSGBLayout
|
||||
call SetPalettes
|
||||
call SetDefaultBGPAndOBP
|
||||
call HOF_SlideBackpic
|
||||
xor a
|
||||
ld [wBoxAlignment], a
|
||||
|
@@ -220,7 +220,7 @@ CutDownTreeOrGrass:
|
||||
ld [hl], a
|
||||
xor a
|
||||
ldh [hBGMapMode], a
|
||||
call OverworldTextModeSwitch
|
||||
call LoadOverworldTilemapAndAttrmapPals
|
||||
call UpdateSprites
|
||||
call DelayFrame
|
||||
ld a, [wCutWhirlpoolAnimationType]
|
||||
@@ -1179,7 +1179,7 @@ DisappearWhirlpool:
|
||||
ld [hl], a
|
||||
xor a
|
||||
ldh [hBGMapMode], a
|
||||
call OverworldTextModeSwitch
|
||||
call LoadOverworldTilemapAndAttrmapPals
|
||||
ld a, [wCutWhirlpoolAnimationType]
|
||||
ld e, a
|
||||
farcall PlayWhirlpoolSound
|
||||
|
@@ -212,7 +212,7 @@ _PlayersHousePC:
|
||||
call _PlayersPC
|
||||
and a
|
||||
jr nz, .changed_deco_tiles
|
||||
call OverworldTextModeSwitch
|
||||
call LoadOverworldTilemapAndAttrmapPals
|
||||
call ApplyTilemap
|
||||
call UpdateSprites
|
||||
call PC_PlayShutdownSound
|
||||
|
@@ -35,7 +35,7 @@ ClosePokepic::
|
||||
call GetMemSGBLayout
|
||||
xor a
|
||||
ldh [hBGMapMode], a
|
||||
call OverworldTextModeSwitch
|
||||
call LoadOverworldTilemapAndAttrmapPals
|
||||
call ApplyTilemap
|
||||
call UpdateSprites
|
||||
call LoadStandardFont
|
||||
|
@@ -64,7 +64,7 @@ _UnownPrinter:
|
||||
|
||||
ld b, SCGB_TRAINER_OR_MON_FRONTPIC_PALS
|
||||
call GetSGBLayout
|
||||
call SetPalettes
|
||||
call SetDefaultBGPAndOBP
|
||||
|
||||
.joy_loop
|
||||
call JoyTextDelay
|
||||
|
@@ -49,12 +49,12 @@ SacredAshScript:
|
||||
special HealParty
|
||||
reloadmappart
|
||||
playsound SFX_WARP_TO
|
||||
special FadeOutPalettes
|
||||
special FadeInPalettes
|
||||
special FadeOutPalettes
|
||||
special FadeInPalettes
|
||||
special FadeOutPalettes
|
||||
special FadeInPalettes
|
||||
special FadeOutToWhite
|
||||
special FadeInFromWhite
|
||||
special FadeOutToWhite
|
||||
special FadeInFromWhite
|
||||
special FadeOutToWhite
|
||||
special FadeInFromWhite
|
||||
waitsfx
|
||||
writetext .UseSacredAshText
|
||||
playsound SFX_CAUGHT_MON
|
||||
|
@@ -30,7 +30,7 @@ SweetScentNothing:
|
||||
end
|
||||
|
||||
SweetScentEncounter:
|
||||
farcall CanUseSweetScent
|
||||
farcall CanEncounterWildMonInThisTile
|
||||
jr nc, .no_battle
|
||||
ld hl, wStatusFlags2
|
||||
bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl]
|
||||
|
@@ -9,7 +9,7 @@ OverworldWhiteoutScript::
|
||||
Script_Whiteout:
|
||||
writetext .WhitedOutText
|
||||
waitbutton
|
||||
special FadeOutPalettes
|
||||
special FadeOutToWhite
|
||||
pause 40
|
||||
special HealParty
|
||||
checkflag ENGINE_BUG_CONTEST_TIMER
|
||||
@@ -39,7 +39,7 @@ OverworldBGMap:
|
||||
BattleBGMap:
|
||||
ld b, SCGB_BATTLE_GRAYSCALE
|
||||
call GetSGBLayout
|
||||
call SetPalettes
|
||||
call SetDefaultBGPAndOBP
|
||||
ret
|
||||
|
||||
HalveMoney:
|
||||
|
Reference in New Issue
Block a user