diff options
| -rwxr-xr-x | engine/pikachu_follow.asm | 6 | ||||
| -rw-r--r-- | home/overworld.asm | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engine/pikachu_follow.asm b/engine/pikachu_follow.asm index 6092eabe..db5fa0ee 100755 --- a/engine/pikachu_follow.asm +++ b/engine/pikachu_follow.asm @@ -182,7 +182,7 @@ CalculatePikachuFacingDirection:: ld [wSpritePikachuStateData1FacingDirection], a ret -CalculatePikachuSpawnState1:: +SetPikachuSpawnOutside:: ld a, [wCurMap] cp OAKS_LAB jr z, .oaks_lab @@ -254,7 +254,7 @@ Pointer_fc653:: db FUCHSIA_HOUSE_3 db $ff -CalculatePikachuSpawnState2:: +SetPikachuSpawnWarpPad:: ld a, [wCurMap] cp VIRIDIAN_FOREST_EXIT jr z, .viridian_forest_exit @@ -302,7 +302,7 @@ Pointer_fc68e:: db CINNABAR_LAB_4 db $ff -CalculatePikachuSpawnState3:: +SetPikachuSpawnBackOutside:: ld a, [wCurMap] cp ROUTE_22_GATE jr z, .asm_fc6a7 diff --git a/home/overworld.asm b/home/overworld.asm index 9c53a3be..8b635aa5 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -473,7 +473,7 @@ WarpFound2:: ld [wMapPalOffset], a call GBFadeOutToBlack .notRockTunnel - callab CalculatePikachuSpawnState1 + callab SetPikachuSpawnOutside call PlayMapChangeSound jr .done @@ -500,11 +500,11 @@ WarpFound2:: ld hl, wd736 res 0, [hl] res 1, [hl] - callab CalculatePikachuSpawnState2 + callab SetPikachuSpawnWarpPad jr .done .goBackOutside - callab CalculatePikachuSpawnState3 + callab SetPikachuSpawnBackOutside ld a, [wLastMap] ld [wCurMap], a call PlayMapChangeSound |