Merge branch 'tinysphere' into future

1 files changed, 14 insertions, 3 deletions

@@ -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() {