From fe1e76466b293c83e6cd3a7d4639fb3c49da26ad Mon Sep 17 00:00:00 2001
From: Rangi <35663410+Rangi42@users.noreply.github.com>
Date: Wed, 7 Jan 2026 22:05:20 -0500
Subject: Use macros to enforce "missable/hide/show object" constraints, and
 rename them to "toggleable objects" (#557)

---
 scripts/PewterCity.asm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'scripts/PewterCity.asm')

diff --git a/scripts/PewterCity.asm b/scripts/PewterCity.asm
index 9693b88f..549a1cad 100644
--- a/scripts/PewterCity.asm
+++ b/scripts/PewterCity.asm
@@ -92,8 +92,8 @@ PewterCityHideSuperNerd1Script:
 	ld a, [wStatusFlags5]
 	bit BIT_SCRIPTED_NPC_MOVEMENT, a
 	ret nz
-	ld a, HS_MUSEUM_GUY
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_MUSEUM_GUY
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	ld a, SCRIPT_PEWTERCITY_RESET_SUPER_NERD1
 	ld [wPewterCityCurScript], a
@@ -103,8 +103,8 @@ PewterCityResetSuperNerd1Script:
 	ld a, PEWTERCITY_SUPER_NERD1
 	ld [wSpriteIndex], a
 	call SetSpritePosition2
-	ld a, HS_MUSEUM_GUY
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_MUSEUM_GUY
+	ld [wToggleableObjectIndex], a
 	predef ShowObject
 	xor a
 	ld [wJoyIgnore], a
@@ -161,8 +161,8 @@ PewterCityHideYoungsterScript:
 	ld a, [wStatusFlags5]
 	bit BIT_SCRIPTED_NPC_MOVEMENT, a
 	ret nz
-	ld a, HS_GYM_GUY
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_GYM_GUY
+	ld [wToggleableObjectIndex], a
 	predef HideObject
 	ld a, SCRIPT_PEWTERCITY_RESET_YOUNGSTER
 	ld [wPewterCityCurScript], a
@@ -172,8 +172,8 @@ PewterCityResetYoungsterScript:
 	ld a, PEWTERCITY_YOUNGSTER
 	ld [wSpriteIndex], a
 	call SetSpritePosition2
-	ld a, HS_GYM_GUY
-	ld [wMissableObjectIndex], a
+	ld a, TOGGLE_GYM_GUY
+	ld [wToggleableObjectIndex], a
 	predef ShowObject
 	xor a
 	ld [wJoyIgnore], a
-- 
cgit v1.3.1-sl0p