3 files changed, 19 insertions, 3 deletions
diff --git a/src/ap_state.cpp b/src/ap_state.cpp
index 8feb78b..b0b4f0b 100644
--- a/src/ap_state.cpp
+++ b/src/ap_state.cpp

@@ -476,16 +476,27 @@ int AP_GetMasteryRequirement() { return GetState().mastery_requirement; }
 int AP_GetLevel2Requirement() { return GetState().level_2_requirement; }
 bool AP_IsLocationVisible(int classification) {
+  int world_state = 0;
  switch (GetState().location_checks) {
    case kNORMAL_LOCATIONS:
-      return classification & kLOCATION_NORMAL;
+      world_state = kLOCATION_NORMAL;
+      break;
    case kREDUCED_LOCATIONS:
-      return classification & kLOCATION_REDUCED;
+      world_state = kLOCATION_REDUCED;
+      break;
    case kPANELSANITY:
-      return classification & kLOCATION_INSANITY;
+      world_state = kLOCATION_INSANITY;
+      break;
    default:
      return false;
  }
+  if (GetState().door_shuffle_mode && !GetState().early_color_hallways) {
+    world_state |= kLOCATION_SMALL_SPHERE_ONE;
+  }
+  return (world_state & classification);
 }
 VictoryCondition AP_GetVictoryCondition() {
diff --git a/src/game_data.cpp b/src/game_data.cpp
index be31b8f..bc4f41b 100644
--- a/src/game_data.cpp
+++ b/src/game_data.cpp

@@ -552,6 +552,10 @@ struct GameData {
        }
      }
+      if (room_name == "Starting Room") {
+        classification |= kLOCATION_SMALL_SPHERE_ONE;
+      }
      int area_id = AddOrGetArea(area_name);
      MapArea &map_area = map_areas_[area_id];
      // room field should be the original room ID
diff --git a/src/game_data.h b/src/game_data.h
index f3edaa2..e30675a 100644
--- a/src/game_data.h
+++ b/src/game_data.h

@@ -22,6 +22,7 @@ enum class LingoColor {
 constexpr int kLOCATION_NORMAL = 1;
 constexpr int kLOCATION_REDUCED = 2;
 constexpr int kLOCATION_INSANITY = 4;
+constexpr int kLOCATION_SMALL_SPHERE_ONE = 8;
 enum class EntranceType {
  kNormal,