From d150f7f4f49e9dda08c52199159b30ae9b4f00e8 Mon Sep 17 00:00:00 2001 From: Yoann Fievez Date: Wed, 24 Jun 2026 20:43:48 +0200 Subject: 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 --- scripts/PokemonFanClub.asm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'scripts/PokemonFanClub.asm') 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 -- cgit v1.3.1-sl0p