diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-31 11:46:02 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-31 11:46:02 -0400 |
| commit | b7a20f13863331e15a074c91a4a1be38d27142c9 (patch) | |
| tree | abfb48aa129b82dc7a88c7b028f2e20a6c671f4d /engine/pikachu_pic_animation.asm | |
| parent | 755ca8914d2878c6a6ef365e962d505ff9d7801e (diff) | |
Vermilion Fan Club
Diffstat (limited to 'engine/pikachu_pic_animation.asm')
| -rwxr-xr-x | engine/pikachu_pic_animation.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/pikachu_pic_animation.asm b/engine/pikachu_pic_animation.asm index a9e0650b..bfac6962 100755 --- a/engine/pikachu_pic_animation.asm +++ b/engine/pikachu_pic_animation.asm @@ -247,7 +247,7 @@ Func_fd05e: ; fd05e (3f:505e) bit 7, [hl] ld a, $1d jr z, .asm_fd0c9 - call CheckPikachuAsleep + call CheckPikachuFollowingPlayer ld a, $1e jr nz, .asm_fd0c9 jr .asm_fd096 @@ -255,7 +255,7 @@ Func_fd05e: ; fd05e (3f:505e) ld a, [wCurMap] cp PEWTER_POKECENTER jr nz, .notPewterPokecenter - call CheckPikachuAsleep + call CheckPikachuFollowingPlayer ld a, $1a jr nz, .asm_fd0c9 jr .asm_fd096 @@ -1636,7 +1636,7 @@ PikachuPewterPokecenterCheck: ; fd8d4 (3f:58d4) ld a, [wCurMap] cp PEWTER_POKECENTER ret nz - call ResetPikachuAsleep + call EnablePikachuFollowingPlayer call Func_fcff2 ret @@ -1644,7 +1644,7 @@ PikachuFanClubCheck: ; fd8e1 (3f:58e1) ld a, [wCurMap] cp POKEMON_FAN_CLUB ret nz - call ResetPikachuAsleep + call EnablePikachuFollowingPlayer call Func_fcff2 ret @@ -1652,7 +1652,7 @@ PikachuBillsHouseCheck: ; fd8ee (3f:58ee) ld a, [wCurMap] cp BILLS_HOUSE ret nz - call ResetPikachuAsleep + call EnablePikachuFollowingPlayer ret Pikachu_LoadCurrentMapViewUpdateSpritesAndDelay3: ; fd8f8 (3f:58f8) |