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/SummerBeachHouse.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/SummerBeachHouse.asm')
| -rw-r--r-- | scripts/SummerBeachHouse.asm | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/scripts/SummerBeachHouse.asm b/scripts/SummerBeachHouse.asm index 3842b45c..3cac9fba 100644 --- a/scripts/SummerBeachHouse.asm +++ b/scripts/SummerBeachHouse.asm @@ -13,12 +13,12 @@ SummerBeachHouse_TextPointers: SummerBeachHouseSurfinDudeText: text_asm - ld a, [wd471] + ld a, [wPikachuSpawnStateFlags] vc_patch Bypass_need_Pikachu_with_Surf_for_minigame IF DEF (_YELLOW_VC) - bit 7, a + bit BIT_PIKACHU_SPAWN_STARTER, a ELSE - bit 6, a + bit BIT_PIKACHU_SPAWN_SURFING, a ENDC vc_patch_end jr nz, .next @@ -26,9 +26,9 @@ ENDC call PrintText jr .done .next - ld hl, wd492 - bit 0, [hl] - set 0, [hl] + ld hl, wPikachuMapScriptFlags + bit BIT_PIKACHU_MAP_PAUSE_IGT, [hl] + set BIT_PIKACHU_MAP_PAUSE_IGT, [hl] jr nz, .next2 ld hl, .SurfinDudeText1 jr .next3 @@ -43,8 +43,8 @@ ENDC ld a, 1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a farcall SurfingPikachuMinigame - ld hl, wd492 - set 1, [hl] + ld hl, wPikachuMapScriptFlags + set BIT_PIKACHU_MAP_SURF_SELECT, [hl] jr .done .asm_f226b ld hl, .SurfinDudeText2 @@ -81,8 +81,8 @@ SummerBeachHousePikachuText: SummerBeachHousePoster1Text: text_asm ld hl, .SummerBeachHousePoster1Text2 - ld a, [wd471] - bit 6, a + ld a, [wPikachuSpawnStateFlags] + bit BIT_PIKACHU_SPAWN_SURFING, a jr z, .next ld hl, .SummerBeachHousePoster1Text1 .next @@ -99,8 +99,8 @@ SummerBeachHousePoster1Text: SummerBeachHousePoster2Text: text_asm ld hl, .SummerBeachHousePoster2Text2 - ld a, [wd471] - bit 6, a + ld a, [wPikachuSpawnStateFlags] + bit BIT_PIKACHU_SPAWN_SURFING, a jr z, .next ld hl, .SummerBeachHousePoster2Text1 .next @@ -117,8 +117,8 @@ SummerBeachHousePoster2Text: SummerBeachHousePoster3Text: text_asm ld hl, .SummerBeachHousePoster3Text2 - ld a, [wd471] - bit 6, a + ld a, [wPikachuSpawnStateFlags] + bit BIT_PIKACHU_SPAWN_SURFING, a jr z, .next ld hl, .SummerBeachHousePoster3Text1 .next @@ -136,26 +136,26 @@ SummerBeachHousePrinterText: text_asm ld a, 1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld a, [wd471] + ld a, [wPikachuSpawnStateFlags] vc_patch Bypass_need_Pikachu_with_Surf_for_high_score IF DEF(_YELLOW_VC) - bit 7, a + bit BIT_PIKACHU_SPAWN_STARTER, a ELSE - bit 6, a + bit BIT_PIKACHU_SPAWN_SURFING, a ENDC vc_patch_end jr z, .asm_f2369 - ld hl, wd492 - bit 1, [hl] + ld hl, wPikachuMapScriptFlags + bit BIT_PIKACHU_MAP_SURF_SELECT, [hl] jr z, .next2 ld a, 0 ld [wDoNotWaitForButtonPressAfterDisplayingText], a .next2 ld hl, .SummerBeachHousePrinterText2 call PrintText - ld a, [wd492] - bit 1, a + ld a, [wPikachuMapScriptFlags] + bit BIT_PIKACHU_MAP_SURF_SELECT, a jr z, .asm_f236f ld a, 1 |