diff options
| author | SatoMew <SatoMew@users.noreply.github.com> | 2023-07-15 23:36:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-15 18:36:59 -0400 |
| commit | f46db37d508f0111ad44ad062ed3d83ba3282d1d (patch) | |
| tree | 170af31852384f5a207918decf05e45a837d95d1 /home/overworld.asm | |
| parent | Add macros, constants, and labels for map scripts and text (#367) (diff) | |
| download | pokeyellow-f46db37d508f0111ad44ad062ed3d83ba3282d1d.tar.gz pokeyellow-f46db37d508f0111ad44ad062ed3d83ba3282d1d.tar.xz pokeyellow-f46db37d508f0111ad44ad062ed3d83ba3282d1d.zip | |
Thoroughly document debug code (#410)
Diffstat (limited to 'home/overworld.asm')
| -rw-r--r-- | home/overworld.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/home/overworld.asm b/home/overworld.asm index be1e6b24..1ebc794b 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -117,7 +117,7 @@ OverworldLoopLessDelay:: predef LoadSAV ld a, [wCurMap] ld [wDestinationMap], a - call SpecialWarpIn + call PrepareForSpecialWarp ld a, [wCurMap] call SwitchToMapRomBank ; switch to the ROM bank of the current map ld hl, wCurMapTileset @@ -762,11 +762,11 @@ HandleBlackOut:: call StopMusic ld hl, wd72e res 5, [hl] - ld a, BANK(ResetStatusAndHalveMoneyOnBlackout) ; also BANK(SpecialWarpIn) and BANK(SpecialEnterMap) + ld a, BANK(ResetStatusAndHalveMoneyOnBlackout) ; also BANK(PrepareForSpecialWarp) and BANK(SpecialEnterMap) ldh [hLoadedROMBank], a ld [MBC1RomBank], a call ResetStatusAndHalveMoneyOnBlackout - call SpecialWarpIn + call PrepareForSpecialWarp call PlayDefaultMusicFadeOutCurrent jp SpecialEnterMap @@ -793,10 +793,10 @@ HandleFlyWarpOrDungeonWarp:: set 2, [hl] ; fly warp or dungeon warp res 5, [hl] ; forced to ride bike call LeaveMapAnim - ld a, BANK(SpecialWarpIn) + ld a, BANK(PrepareForSpecialWarp) ldh [hLoadedROMBank], a ld [MBC1RomBank], a - call SpecialWarpIn + call PrepareForSpecialWarp jp SpecialEnterMap LeaveMapAnim:: |