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/Route20.asm | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'scripts/Route20.asm')

diff --git a/scripts/Route20.asm b/scripts/Route20.asm
index 5230858e..3c528b09 100644
--- a/scripts/Route20.asm
+++ b/scripts/Route20.asm
@@ -12,48 +12,48 @@ Route20_Script:
 Route20BoulderScript:
 	CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE
 	jr z, .next_boulder_check
-	ld a, HS_SEAFOAM_ISLANDS_1F_BOULDER_1
+	ld a, TOGGLE_SEAFOAM_ISLANDS_1F_BOULDER_1
 	call Route20ShowObjectScript
-	ld a, HS_SEAFOAM_ISLANDS_1F_BOULDER_2
+	ld a, TOGGLE_SEAFOAM_ISLANDS_1F_BOULDER_2
 	call Route20ShowObjectScript
-	ld hl, .MissableObjectIDs
-.hide_missable_objects
+	ld hl, .ToggleableObjectIDs
+.hide_toggleable_objects
 	ld a, [hli]
 	cp $ff
 	jr z, .next_boulder_check
 	push hl
 	call Route20HideObjectScript
 	pop hl
-	jr .hide_missable_objects
-
-.MissableObjectIDs:
-	db HS_SEAFOAM_ISLANDS_B1F_BOULDER_1
-	db HS_SEAFOAM_ISLANDS_B1F_BOULDER_2
-	db HS_SEAFOAM_ISLANDS_B2F_BOULDER_1
-	db HS_SEAFOAM_ISLANDS_B2F_BOULDER_2
-	db HS_SEAFOAM_ISLANDS_B3F_BOULDER_3
-	db HS_SEAFOAM_ISLANDS_B3F_BOULDER_4
+	jr .hide_toggleable_objects
+
+.ToggleableObjectIDs:
+	db TOGGLE_SEAFOAM_ISLANDS_B1F_BOULDER_1
+	db TOGGLE_SEAFOAM_ISLANDS_B1F_BOULDER_2
+	db TOGGLE_SEAFOAM_ISLANDS_B2F_BOULDER_1
+	db TOGGLE_SEAFOAM_ISLANDS_B2F_BOULDER_2
+	db TOGGLE_SEAFOAM_ISLANDS_B3F_BOULDER_3
+	db TOGGLE_SEAFOAM_ISLANDS_B3F_BOULDER_4
 	db -1 ; end
 
 .next_boulder_check
 	CheckBothEventsSet EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE
 	ret z
-	ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_1
+	ld a, TOGGLE_SEAFOAM_ISLANDS_B3F_BOULDER_1
 	call Route20ShowObjectScript
-	ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_2
+	ld a, TOGGLE_SEAFOAM_ISLANDS_B3F_BOULDER_2
 	call Route20ShowObjectScript
-	ld a, HS_SEAFOAM_ISLANDS_B4F_BOULDER_1
+	ld a, TOGGLE_SEAFOAM_ISLANDS_B4F_BOULDER_1
 	call Route20HideObjectScript
-	ld a, HS_SEAFOAM_ISLANDS_B4F_BOULDER_2
+	ld a, TOGGLE_SEAFOAM_ISLANDS_B4F_BOULDER_2
 	call Route20HideObjectScript
 	ret
 
 Route20ShowObjectScript:
-	ld [wMissableObjectIndex], a
+	ld [wToggleableObjectIndex], a
 	predef_jump ShowObject
 
 Route20HideObjectScript:
-	ld [wMissableObjectIndex], a
+	ld [wToggleableObjectIndex], a
 	predef_jump HideObject
 
 Route20_ScriptPointers:
-- 
cgit v1.3.1-sl0p