diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-06 15:21:01 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-06 15:21:01 -0400 |
| commit | 5630392f9f96c5dfeca785005bfa0f317fdb3905 (patch) | |
| tree | c738f0da8962156fa6480ef2ef212406958c69a1 /engine/pikachu_emotions.asm | |
| parent | 96a58ce52ac4b8c4c8b2ecbf0f185d1ebda10a6e (diff) | |
More Pikachu function documentation
Diffstat (limited to 'engine/pikachu_emotions.asm')
| -rwxr-xr-x | engine/pikachu_emotions.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/pikachu_emotions.asm b/engine/pikachu_emotions.asm index fdfb7813..b474770e 100755 --- a/engine/pikachu_emotions.asm +++ b/engine/pikachu_emotions.asm @@ -250,7 +250,7 @@ MapSpecificPikachuExpression: ; fd05e (3f:505e) call CheckPikachuFollowingPlayer ld a, $1e jr nz, .set_carry - jr .asm_fd096 + jr .check_pikachu_status .notFanClub ld a, [wCurMap] @@ -259,20 +259,20 @@ MapSpecificPikachuExpression: ; fd05e (3f:505e) call CheckPikachuFollowingPlayer ld a, $1a jr nz, .set_carry - jr .asm_fd096 + jr .check_pikachu_status .notPewterPokecenter callab Func_f24ae ld a, e cp $ff jr nz, .set_carry - jr .asm_fd096 + jr .check_pikachu_status ; useless -.asm_fd096 +.check_pikachu_status call IsPlayerPikachuAsleepInParty ld a, $b jr c, .set_carry - callab Func_fce73 ; same bank + callab CheckPikachuFaintedOrStatused ; same bank ld a, $1c jr c, .set_carry ld a, [wCurMap] |