diff options
| author | Yoann Fievez <yoann.fievez@gmail.com> | 2026-06-24 20:43:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-06-24 14:43:48 -0400 |
| commit | d150f7f4f49e9dda08c52199159b30ae9b4f00e8 (patch) | |
| tree | e0c81ae315ccdf2952c10713312427f2c55e1fea /engine/pikachu/pikachu_emotions.asm | |
| parent | Use OAM constants and decimal coordinates in surfing_pikachu_oam.asm (#157) (diff) | |
| download | pokeyellow-d150f7f4f49e9dda08c52199159b30ae9b4f00e8.tar.gz pokeyellow-d150f7f4f49e9dda08c52199159b30ae9b4f00e8.tar.xz pokeyellow-d150f7f4f49e9dda08c52199159b30ae9b4f00e8.zip | |
Identify `wPikachuSpawnStateFlags` and `wPikachuMapScriptFlags` bits, and `PIKAMOVEMENT_*` constants (#158)
- Rename `wd471` to` wPikachuSpawnStateFlags`, with `BIT_PIKACHU_SPAWN_*` bits
- Rename `wd492` to `wPikachuMapScriptFlags`, with `BIT_PIKACHU_MAP_*` bits
- Introduce `PIKAMOVEMENT_*` constants for `ApplyPikachuMovementData`
- Refactor `BillsHouse` scripts and Pikachu/Bill movement data
Diffstat (limited to 'engine/pikachu/pikachu_emotions.asm')
| -rw-r--r-- | engine/pikachu/pikachu_emotions.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/pikachu/pikachu_emotions.asm b/engine/pikachu/pikachu_emotions.asm index 787b4f94..22501085 100644 --- a/engine/pikachu/pikachu_emotions.asm +++ b/engine/pikachu/pikachu_emotions.asm @@ -304,8 +304,8 @@ MapSpecificPikachuExpression: ld a, [wCurMap] cp POKEMON_FAN_CLUB jr nz, .notFanClub - ld hl, wd492 - bit 7, [hl] + ld hl, wPikachuMapScriptFlags + bit BIT_PIKACHU_MAP_SCRIPT_ACTIVE, [hl] ldpikaemotion a, PikachuEmotion29 jr z, .play_emotion call CheckPikachuFollowingPlayer @@ -323,7 +323,7 @@ MapSpecificPikachuExpression: jr .check_pikachu_status .notPewterPokecenter - callfar Func_f24ae + callfar BillsHouse_CheckPikachuEmotion ld a, e cp $ff jr nz, .play_emotion |