2 files changed, 8 insertions, 5 deletions
diff --git a/include/toBeSorted/d_beacon.h b/include/toBeSorted/d_beacon.h
index 27efce6a..b963d98a 100644
--- a/include/toBeSorted/d_beacon.h
+++ b/include/toBeSorted/d_beacon.h
@@ -16,4 +16,7 @@ void setBeaconPosition(const mVec3_c *position, u32 beaconIndex);
  */
 void setBeaconPositionChecked(const mVec3_c *position, u32 beaconIndex);
 
+/** Checks whether the current stage is ineligible for beacon placement */
+bool doesStageForbidBeaconPlacement();
+
 #endif
diff --git a/include/toBeSorted/event_manager_util.h b/include/toBeSorted/event_manager_util.h
index 9d38951f..d2f4670b 100644
--- a/include/toBeSorted/event_manager_util.h
+++ b/include/toBeSorted/event_manager_util.h
@@ -32,15 +32,15 @@ inline bool EventManagerIsInMap() {
 }
 
 inline bool EventManagerIsMapOpen() {
-    return EventManagerIsInMap() && dLytMap_c::GetInstance()->isOpenMaybe();
+    return EventManagerIsInMap() && dLytMap_c::GetInstance()->isOpen();
 }
 
-inline bool EventManagerIsMapOpenAndMessage() {
-    return EventManagerIsMapOpen() && !dMessage_c::getInstance()->getField_0x328();
+inline bool EventManagerIsMapOpenNormal() {
+    return EventManagerIsMapOpen() && !dMessage_c::getInstance()->getInMapEvent();
 }
 
-inline bool EventManagerIsMapOpenAnd0x9008Eq10() {
-    return EventManagerIsMapOpen() && dLytMap_c::GetInstance()->isSomeMapFieldEq10();
+inline bool EventManagerIsMapEventSaveObj() {
+    return EventManagerIsMapOpen() && dLytMap_c::GetInstance()->isMapEventSaveObj();
 }
 
 #endif