aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/CeruleanCity_2.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2026-01-07 22:05:20 -0500
committerGitHub <noreply@github.com>2026-01-07 22:05:20 -0500
commitfe1e76466b293c83e6cd3a7d4639fb3c49da26ad (patch)
treeaba22f9f595e09024b902c08ddfdac67ee0e85f3 /scripts/CeruleanCity_2.asm
parentUpdate RGBDS to 1.0.1 (although 1.0.0 still works) (diff)
downloadpokeyellow-fe1e76466b293c83e6cd3a7d4639fb3c49da26ad.tar.gz
pokeyellow-fe1e76466b293c83e6cd3a7d4639fb3c49da26ad.tar.xz
pokeyellow-fe1e76466b293c83e6cd3a7d4639fb3c49da26ad.zip
Use macros to enforce "missable/hide/show object" constraints, and rename them to "toggleable objects" (#557)
Diffstat (limited to 'scripts/CeruleanCity_2.asm')
-rw-r--r--scripts/CeruleanCity_2.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/CeruleanCity_2.asm b/scripts/CeruleanCity_2.asm
index 53ace5c8..85986a7a 100644
--- a/scripts/CeruleanCity_2.asm
+++ b/scripts/CeruleanCity_2.asm
@@ -3,14 +3,14 @@ CeruleanHideRocket:
; one is called after you beat the Rocket that gives you TM28 DIG.
; the screen then fades out, he disappears, and fades back in
call GBFadeOutToBlack
- ld a, HS_CERULEAN_GUARD_1
- ld [wMissableObjectIndex], a
+ ld a, TOGGLE_CERULEAN_GUARD_1
+ ld [wToggleableObjectIndex], a
predef ShowObject
- ld a, HS_CERULEAN_GUARD_2
- ld [wMissableObjectIndex], a
+ ld a, TOGGLE_CERULEAN_GUARD_2
+ ld [wToggleableObjectIndex], a
predef HideObject
- ld a, HS_CERULEAN_ROCKET
- ld [wMissableObjectIndex], a
+ ld a, TOGGLE_CERULEAN_ROCKET
+ ld [wToggleableObjectIndex], a
predef HideObject
call GBFadeInFromBlack
ret