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)

---
 home/overworld.asm | 2 +-
 home/trainers.asm  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'home')

diff --git a/home/overworld.asm b/home/overworld.asm
index e994f694..58550167 100644
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -2003,7 +2003,7 @@ LoadPlayerSpriteGraphicsCommon::
 
 ; function to load data from the map header
 LoadMapHeader::
-	farcall MarkTownVisitedAndLoadMissableObjects
+	farcall MarkTownVisitedAndLoadToggleableObjects
 	ld a, [wCurMapTileset]
 	ld [wUnusedCurMapTilesetCopy], a
 	ld a, [wCurMap]
diff --git a/home/trainers.asm b/home/trainers.asm
index 8d2cceaf..87bc7d69 100644
--- a/home/trainers.asm
+++ b/home/trainers.asm
@@ -202,13 +202,13 @@ EndTrainerBattle::
 	ld a, [wEnemyMonOrTrainerClass]
 	cp OPP_ID_OFFSET
 	jr nc, .skipRemoveSprite ; test if trainer was fought (in that case skip removing the corresponding sprite)
-	ld hl, wMissableObjectList
+	ld hl, wToggleableObjectList
 	ld de, $2
 	ld a, [wSpriteIndex]
 	call IsInArray ; search for sprite ID
 	inc hl
 	ld a, [hl]
-	ld [wMissableObjectIndex], a ; load corresponding missable object index and remove it
+	ld [wToggleableObjectIndex], a ; load corresponding toggleable object index and remove it
 	predef HideObject
 .skipRemoveSprite
 	ld hl, wStatusFlags5
-- 
cgit v1.3.1-sl0p