diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-05-20 19:16:49 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 19:16:49 -0500 |
| commit | b8954732a3eaa3a784a6e3eaaa68977a9ccd9816 (patch) | |
| tree | d159ecef6698b656f5acbffde5d6372b52f25c84 /engine/pikachu_follow.asm | |
| parent | 2c018b9c735818491a0f590117b68d9358b8f334 (diff) | |
| parent | 45576fef167039b9a26d48b93c54d77275957874 (diff) | |
Merge pull request #39 from TiKevin83/master
Label functions, note causes of bugs
Diffstat (limited to 'engine/pikachu_follow.asm')
| -rwxr-xr-x | engine/pikachu_follow.asm | 6 |
1 files changed, 3 insertions, 3 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 |