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/Route25.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'scripts/Route25.asm') diff --git a/scripts/Route25.asm b/scripts/Route25.asm index 23faa396..41134ee8 100644 --- a/scripts/Route25.asm +++ b/scripts/Route25.asm @@ -9,11 +9,11 @@ Route25_Script: ret Route25ToggleBillsScript: - ld hl, wd492 - res 2, [hl] - res 3, [hl] - res 4, [hl] - res 7, [hl] + ld hl, wPikachuMapScriptFlags + res BIT_PIKACHU_MAP_2, [hl] + res BIT_PIKACHU_MAP_3, [hl] + res BIT_PIKACHU_MAP_4, [hl] + res BIT_PIKACHU_MAP_SCRIPT_ACTIVE, [hl] xor a ld [wBillsHouseCurScript], a ld hl, wCurrentMapScriptFlags -- cgit v1.3.1-sl0p