From 0e49aef88ef94b9d3e80d89e4eb718e9425045df Mon Sep 17 00:00:00 2001
From: Rangi <35663410+Rangi42@users.noreply.github.com>
Date: Wed, 7 Jan 2026 22:05:37 -0500
Subject: Use macros to enforce "hidden object" constraints, and rename them to
 "hidden events" (#559)

---
 ram/hram.asm |  2 +-
 ram/wram.asm | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'ram')

diff --git a/ram/hram.asm b/ram/hram.asm
index 9cfb5327..24260b80 100644
--- a/ram/hram.asm
+++ b/ram/hram.asm
@@ -370,7 +370,7 @@ hSpriteMapXCoord::    db
 NEXTU
 hItemAlreadyFound:: db
 	ds 2
-hDidntFindAnyHiddenObject:: db
+hDidntFindAnyHiddenEvent:: db
 
 NEXTU
 	ds 1
diff --git a/ram/wram.asm b/ram/wram.asm
index 5eefaf06..44775192 100644
--- a/ram/wram.asm
+++ b/ram/wram.asm
@@ -390,7 +390,7 @@ wSlotMachineSevenAndBarModeChance:: db
 ; ROM back to return to when the player is done with the slot machine
 wSlotMachineSavedROMBank:: db
 	ds 166
-wLuckySlotHiddenObjectIndex:: db
+wLuckySlotHiddenEventIndex:: db
 
 NEXTU
 ; values between 0-6. Shake screen horizontally, shake screen vertically, blink Pokemon...
@@ -744,12 +744,12 @@ wTempCoins1:: dw
 wTempCoins2:: dw
 
 NEXTU
-wHiddenObjectFunctionArgument:: db
-wHiddenObjectFunctionRomBank:: db
-wHiddenObjectIndex:: db
-wHiddenObjectY:: db
+wHiddenEventFunctionArgument:: db
+wHiddenEventFunctionRomBank:: db
+wHiddenEventIndex:: db
+wHiddenEventY:: db
 wHiddenItemOrCoinsIndex::
-wHiddenObjectX:: db
+wHiddenEventX:: db
 
 NEXTU
 wPlayerSpinInPlaceAnimFrameDelay:: db
-- 
cgit v1.3.1-sl0p