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 --- engine/events/poison.asm | 4 ++-- engine/events/try_pikachu_movement.asm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'engine/events') diff --git a/engine/events/poison.asm b/engine/events/poison.asm index e0464ae8..a518f82d 100644 --- a/engine/events/poison.asm +++ b/engine/events/poison.asm @@ -3,8 +3,8 @@ ApplyOutOfBattlePoisonDamage: ASSERT BIT_SCRIPTED_MOVEMENT_STATE == 7 add a ; overflows scripted movement state bit into carry flag jp c, .noBlackOut ; no black out if joypad states are being simulated - ld a, [wd492] - bit 7, a + ld a, [wPikachuMapScriptFlags] + bit BIT_PIKACHU_MAP_SCRIPT_ACTIVE, a jp nz, .noBlackOut ld a, [wStatusFlags4] bit BIT_LINK_CONNECTED, a diff --git a/engine/events/try_pikachu_movement.asm b/engine/events/try_pikachu_movement.asm index 9dd25008..2e05b037 100644 --- a/engine/events/try_pikachu_movement.asm +++ b/engine/events/try_pikachu_movement.asm @@ -1,6 +1,6 @@ TryApplyPikachuMovementData:: - ld a, [wd471] - bit 7, a + ld a, [wPikachuSpawnStateFlags] + bit BIT_PIKACHU_SPAWN_STARTER, a ret z ld a, [wWalkBikeSurfState] and a -- cgit v1.3.1-sl0p