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 /home/overworld.asm | |
| parent | 2c018b9c735818491a0f590117b68d9358b8f334 (diff) | |
| parent | 45576fef167039b9a26d48b93c54d77275957874 (diff) | |
Merge pull request #39 from TiKevin83/master
Label functions, note causes of bugs
Diffstat (limited to 'home/overworld.asm')
| -rw-r--r-- | home/overworld.asm | 6 |
1 files changed, 3 insertions, 3 deletions
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 |