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/SilphCo11F.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/SilphCo11F.asm')
| -rw-r--r-- | scripts/SilphCo11F.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/SilphCo11F.asm b/scripts/SilphCo11F.asm index 5b72e3f8..38c674f4 100644 --- a/scripts/SilphCo11F.asm +++ b/scripts/SilphCo11F.asm @@ -435,9 +435,9 @@ SilphCo11FScript13: ld a, PAD_BUTTONS | PAD_CTRL_PAD ld [wJoyIgnore], a call GBFadeOutToBlack - ld a, HS_SILPH_CO_11F_JAMES + ld a, TOGGLE_SILPH_CO_11F_JAMES call SilphCo11FScript_HideObject - ld a, HS_SILPH_CO_11F_JESSIE + ld a, TOGGLE_SILPH_CO_11F_JESSIE call SilphCo11FScript_HideObject call UpdateSprites call Delay3 @@ -458,14 +458,14 @@ SilphCo11FScript14: ret SilphCo11FScript_ShowObject: - ld [wMissableObjectIndex], a + ld [wToggleableObjectIndex], a predef ShowObject call UpdateSprites call Delay3 ret SilphCo11FScript_HideObject: - ld [wMissableObjectIndex], a + ld [wToggleableObjectIndex], a predef HideObject ret |