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/MtMoonB2F.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/MtMoonB2F.asm')
| -rw-r--r-- | scripts/MtMoonB2F.asm | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/scripts/MtMoonB2F.asm b/scripts/MtMoonB2F.asm index 4b82ea12..7890c88e 100644 --- a/scripts/MtMoonB2F.asm +++ b/scripts/MtMoonB2F.asm @@ -48,9 +48,9 @@ MtMoonB2FSetScript: ret MtMoonB2FScript_HideJessieJames: - ld a, HS_MT_MOON_B2F_JESSIE + ld a, TOGGLE_MT_MOON_B2F_JESSIE call MtMoonB2FScript_HideObject - ld a, HS_MT_MOON_B2F_JAMES + ld a, TOGGLE_MT_MOON_B2F_JAMES call MtMoonB2FScript_HideObject ret @@ -208,13 +208,13 @@ MtMoonB2FSuperNerdTakesOtherFossilScript: ldh [hTextID], a call DisplayTextID CheckEvent EVENT_GOT_HELIX_FOSSIL - jr z, .asm_49e1d - ld a, HS_MT_MOON_B2F_FOSSIL_1 - jr .asm_49e1f -.asm_49e1d - ld a, HS_MT_MOON_B2F_FOSSIL_2 -.asm_49e1f - ld [wMissableObjectIndex], a + jr z, .got_helix_fossil + ld a, TOGGLE_MT_MOON_B2F_FOSSIL_1 + jr .continue +.got_helix_fossil + ld a, TOGGLE_MT_MOON_B2F_FOSSIL_2 +.continue + ld [wToggleableObjectIndex], a predef HideObject xor a ld [wJoyIgnore], a @@ -237,9 +237,9 @@ MtMoonB2FScript_49e15: ldh [hJoyHeld], a ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD ld [wJoyIgnore], a - ld a, HS_MT_MOON_B2F_JESSIE + ld a, TOGGLE_MT_MOON_B2F_JESSIE call MtMoonB2FScript_ShowObject - ld a, HS_MT_MOON_B2F_JAMES + ld a, TOGGLE_MT_MOON_B2F_JAMES call MtMoonB2FScript_ShowObject ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a @@ -379,9 +379,9 @@ MtMoonB2FScript14: ld a, PAD_BUTTONS | PAD_CTRL_PAD ld [wJoyIgnore], a call GBFadeOutToBlack - ld a, HS_MT_MOON_B2F_JESSIE + ld a, TOGGLE_MT_MOON_B2F_JESSIE call MtMoonB2FScript_HideObject - ld a, HS_MT_MOON_B2F_JAMES + ld a, TOGGLE_MT_MOON_B2F_JAMES call MtMoonB2FScript_HideObject call UpdateSprites call Delay3 @@ -402,14 +402,14 @@ MtMoonB2FScript15: ret MtMoonB2FScript_ShowObject: - ld [wMissableObjectIndex], a + ld [wToggleableObjectIndex], a predef ShowObject call UpdateSprites call Delay3 ret MtMoonB2FScript_HideObject: - ld [wMissableObjectIndex], a + ld [wToggleableObjectIndex], a predef HideObject ret @@ -536,8 +536,8 @@ MtMoonB2FDomeFossilText: call GiveItem jp nc, MtMoonB2FYouHaveNoRoomText call MtMoonB2FReceivedFossilText - ld a, HS_MT_MOON_B2F_FOSSIL_1 - ld [wMissableObjectIndex], a + ld a, TOGGLE_MT_MOON_B2F_FOSSIL_1 + ld [wToggleableObjectIndex], a predef HideObject SetEvent EVENT_GOT_DOME_FOSSIL ld a, SCRIPT_MTMOONB2F_MOVE_SUPER_NERD @@ -563,8 +563,8 @@ MtMoonB2FHelixFossilText: call GiveItem jp nc, MtMoonB2FYouHaveNoRoomText call MtMoonB2FReceivedFossilText - ld a, HS_MT_MOON_B2F_FOSSIL_2 - ld [wMissableObjectIndex], a + ld a, TOGGLE_MT_MOON_B2F_FOSSIL_2 + ld [wToggleableObjectIndex], a predef HideObject SetEvent EVENT_GOT_HELIX_FOSSIL ld a, SCRIPT_MTMOONB2F_MOVE_SUPER_NERD |