diff options
| author | dannye <33dannye@gmail.com> | 2026-01-17 22:38:33 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2026-01-17 22:38:33 -0600 |
| commit | bc2354dd6626ce28bb9561547ed2107cfa56c18e (patch) | |
| tree | 5902d4c3389253c76b7c3351e0d7dfecb551c28d /scripts/RocketHideoutB4F.asm | |
| parent | Identify characters in `_OakSpeechText2B` and `Printer_GetMonStats.IDNo` (#144) (diff) | |
| parent | Use macros for `WildMonEncounterSlotChances` (#562) (diff) | |
| download | pokeyellow-bc2354dd6626ce28bb9561547ed2107cfa56c18e.tar.gz pokeyellow-bc2354dd6626ce28bb9561547ed2107cfa56c18e.tar.xz pokeyellow-bc2354dd6626ce28bb9561547ed2107cfa56c18e.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'scripts/RocketHideoutB4F.asm')
| -rw-r--r-- | scripts/RocketHideoutB4F.asm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/scripts/RocketHideoutB4F.asm b/scripts/RocketHideoutB4F.asm index 15a98853..118ebf89 100644 --- a/scripts/RocketHideoutB4F.asm +++ b/scripts/RocketHideoutB4F.asm @@ -18,9 +18,9 @@ RocketHideoutB4FSetScript: ret RocketHideoutB4FScript_HideJessieJames: - ld a, HS_ROCKET_HIDEOUT_B4F_JAMES + ld a, TOGGLE_ROCKET_HIDEOUT_B4F_JAMES call RocketHideoutB4FScript_HideObject - ld a, HS_ROCKET_HIDEOUT_B4F_JESSIE + ld a, TOGGLE_ROCKET_HIDEOUT_B4F_JESSIE call RocketHideoutB4FScript_HideObject ret @@ -52,11 +52,11 @@ RocketHideoutB4FBeatGiovanniScript: ldh [hTextID], a call DisplayTextID call GBFadeOutToBlack - ld a, HS_ROCKET_HIDEOUT_B4F_GIOVANNI - ld [wMissableObjectIndex], a + ld a, TOGGLE_ROCKET_HIDEOUT_B4F_GIOVANNI + ld [wToggleableObjectIndex], a predef HideObject - ld a, HS_ROCKET_HIDEOUT_B4F_ITEM_4 - ld [wMissableObjectIndex], a + ld a, TOGGLE_ROCKET_HIDEOUT_B4F_ITEM_4 + ld [wToggleableObjectIndex], a predef ShowObject call UpdateSprites call GBFadeInFromBlack @@ -114,9 +114,9 @@ RocketHideoutB4FScript_455a5: ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld a, PAD_BUTTONS | PAD_CTRL_PAD ld [wJoyIgnore], a - ld a, HS_ROCKET_HIDEOUT_B4F_JAMES + ld a, TOGGLE_ROCKET_HIDEOUT_B4F_JAMES call RocketHideoutB4FScript_ShowObject - ld a, HS_ROCKET_HIDEOUT_B4F_JESSIE + ld a, TOGGLE_ROCKET_HIDEOUT_B4F_JESSIE call RocketHideoutB4FScript_ShowObject ld a, SCRIPT_ROCKETHIDEOUTB4F_SCRIPT4 call RocketHideoutB4FSetScript @@ -255,9 +255,9 @@ RocketHideoutB4FScript12: ld a, PAD_BUTTONS | PAD_CTRL_PAD ld [wJoyIgnore], a call GBFadeOutToBlack - ld a, HS_ROCKET_HIDEOUT_B4F_JAMES + ld a, TOGGLE_ROCKET_HIDEOUT_B4F_JAMES call RocketHideoutB4FScript_HideObject - ld a, HS_ROCKET_HIDEOUT_B4F_JESSIE + ld a, TOGGLE_ROCKET_HIDEOUT_B4F_JESSIE call RocketHideoutB4FScript_HideObject call UpdateSprites call Delay3 @@ -277,14 +277,14 @@ RocketHideoutB4FScript13: ret RocketHideoutB4FScript_ShowObject: - ld [wMissableObjectIndex], a + ld [wToggleableObjectIndex], a predef ShowObject call UpdateSprites call Delay3 ret RocketHideoutB4FScript_HideObject: - ld [wMissableObjectIndex], a + ld [wToggleableObjectIndex], a predef HideObject ret @@ -399,8 +399,8 @@ RocketHideoutB4FRocketEndBattleText: text_promptbutton text_asm SetEvent EVENT_ROCKET_DROPPED_LIFT_KEY - ld a, HS_ROCKET_HIDEOUT_B4F_ITEM_5 - ld [wMissableObjectIndex], a + ld a, TOGGLE_ROCKET_HIDEOUT_B4F_ITEM_5 + ld [wToggleableObjectIndex], a predef ShowObject jp TextScriptEnd |