From 81e1cb38da58ae34e7e4ac9e150181e8fa298fcb Mon Sep 17 00:00:00 2001
From: Gregory Heskett <gheskett@gmail.com>
Date: Tue, 7 Mar 2023 00:32:19 -0500
Subject: [PATCH] Bugfix: Fix reference to missing function (#589)

---
 src/game/object_helpers.c | 6 +++++-
 src/game/object_helpers.h | 1 -
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/game/object_helpers.c b/src/game/object_helpers.c
index fd276ff0..64cdb0b2 100644
--- a/src/game/object_helpers.c
+++ b/src/game/object_helpers.c
@@ -1882,7 +1882,11 @@ void bhv_init_room(void) {
 
 s32 is_mario_in_room(void) {
     if (o->oRoom != -1 && gMarioCurrentRoom != 0) {
-        if (is_room_loaded()) {
+        if (
+            gMarioCurrentRoom == o->oRoom ||
+            gDoorAdjacentRooms[gMarioCurrentRoom][0] == o->oRoom ||
+            gDoorAdjacentRooms[gMarioCurrentRoom][1] == o->oRoom
+        ) {
             return MARIO_INSIDE_ROOM;
         }
         return MARIO_OUTSIDE_ROOM;
diff --git a/src/game/object_helpers.h b/src/game/object_helpers.h
index 61b04d63..3c257b34 100644
--- a/src/game/object_helpers.h
+++ b/src/game/object_helpers.h
@@ -241,7 +241,6 @@ void cur_obj_call_action_function(ObjActionFunc actionFunctions[]);
 s32 cur_obj_mario_far_away(void);
 s32 is_mario_moving_fast_or_in_air(s32 speedThreshold);
 s32 is_item_in_array(s8 item, s8 *array);
-u32 is_room_loaded(void);
 s32 is_mario_in_room(void);
 void cur_obj_enable_disable_room_rendering(s32 inRoom);
 s32 cur_obj_set_hitbox_and_die_if_attacked(struct ObjectHitbox *hitbox, s32 deathSound, s32 noLootCoins);