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 /scripts/PokemonFanClub.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 'scripts/PokemonFanClub.asm')
| -rw-r--r-- | scripts/PokemonFanClub.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/scripts/PokemonFanClub.asm b/scripts/PokemonFanClub.asm index 4c8acd39..5bd881af 100644 --- a/scripts/PokemonFanClub.asm +++ b/scripts/PokemonFanClub.asm @@ -11,19 +11,19 @@ PokemonFanClub_ScriptPointers: dw_const PokemonFanClubScript1, SCRIPT_POKEMONFANCLUB_SCRIPT1 PokemonFanClubScript0: - ld hl, wd492 - bit 7, [hl] + ld hl, wPikachuMapScriptFlags + bit BIT_PIKACHU_MAP_SCRIPT_ACTIVE, [hl] call z, PokemonFanClubScript_59a44 - ld hl, wd492 - set 7, [hl] + ld hl, wPikachuMapScriptFlags + set BIT_PIKACHU_MAP_SCRIPT_ACTIVE, [hl] ret PokemonFanClubScript1: - ld hl, wd492 - bit 7, [hl] + ld hl, wPikachuMapScriptFlags + bit BIT_PIKACHU_MAP_SCRIPT_ACTIVE, [hl] call z, PokemonFanClubScript_59a39 - ld hl, wd492 - set 7, [hl] + ld hl, wPikachuMapScriptFlags + set BIT_PIKACHU_MAP_SCRIPT_ACTIVE, [hl] ret PokemonFanClubScript_59a39: @@ -34,8 +34,8 @@ PokemonFanClubScript_59a39: ret PokemonFanClubScript_59a44: - ld a, [wd471] - bit 7, a + ld a, [wPikachuSpawnStateFlags] + bit BIT_PIKACHU_SPAWN_STARTER, a ret z callfar CheckPikachuStatusCondition ret c |