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 | |
| 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')
| -rw-r--r-- | engine/events/poison.asm | 4 | ||||
| -rw-r--r-- | engine/events/try_pikachu_movement.asm | 4 | ||||
| -rw-r--r-- | engine/minigame/surfing_pikachu.asm | 4 | ||||
| -rw-r--r-- | engine/pikachu/pikachu_emotions.asm | 6 | ||||
| -rw-r--r-- | engine/pikachu/pikachu_follow.asm | 8 |
5 files changed, 13 insertions, 13 deletions
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 diff --git a/engine/minigame/surfing_pikachu.asm b/engine/minigame/surfing_pikachu.asm index 27e91ba1..b413bf10 100644 --- a/engine/minigame/surfing_pikachu.asm +++ b/engine/minigame/surfing_pikachu.asm @@ -85,8 +85,8 @@ SurfingPikachuLoop: ret SurfingPikachu_CheckPressedSelect: - ld hl, wd492 - bit 1, [hl] + ld hl, wPikachuMapScriptFlags + bit BIT_PIKACHU_MAP_SURF_SELECT, [hl] ret z ldh a, [hJoyPressed] and PAD_SELECT 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 diff --git a/engine/pikachu/pikachu_follow.asm b/engine/pikachu/pikachu_follow.asm index 11093c29..e6eba17e 100644 --- a/engine/pikachu/pikachu_follow.asm +++ b/engine/pikachu/pikachu_follow.asm @@ -140,8 +140,8 @@ CalculatePikachuPlacementCoords:: inc hl ld [hl], $fe push hl - ld hl, wd471 - set 5, [hl] + ld hl, wPikachuSpawnStateFlags + set BIT_PIKACHU_SPAWN_FOLLOWING, [hl] pop hl ret @@ -1278,8 +1278,8 @@ Func_fcc23: ld a, [wPikachuOverworldStateFlags] bit 7, a jr nz, .asm_fcc40 - ld a, [wd471] - bit 7, a + ld a, [wPikachuSpawnStateFlags] + bit BIT_PIKACHU_SPAWN_STARTER, a jr z, .asm_fcc40 ld a, [wWalkBikeSurfState] and a |