Update LockOverworldDoors.cpp

soh/soh/Enhancements/randomizer/LockOverworldDoors.cpp

@@ -16,7 +16,6 @@ std::map<SceneDoorParamsPair, RandomizerInf> lookupTable = {
     {{ SCENE_MARKET_ENTRANCE_DAY, 447 },         RAND_INF_GUARD_HOUSE_UNLOCKED },
     {{ SCENE_MARKET_ENTRANCE_NIGHT, 447 },       RAND_INF_GUARD_HOUSE_UNLOCKED },
     {{ SCENE_MARKET_ENTRANCE_RUINS, 447 },       RAND_INF_GUARD_HOUSE_UNLOCKED },
-    {{ SCENE_MARKET_GUARD_HOUSE, 447 },          RAND_INF_GUARD_HOUSE_UNLOCKED },
     {{ SCENE_MARKET_DAY, 4543 },                 RAND_INF_MARKET_BAZAAR_UNLOCKED },
     {{ SCENE_MARKET_NIGHT, 4753 },               RAND_INF_MARKET_BAZAAR_UNLOCKED },
     {{ SCENE_MARKET_DAY, 1471 },                 RAND_INF_MARKET_POTION_SHOP_UNLOCKED },
@@ -25,22 +24,16 @@ std::map<SceneDoorParamsPair, RandomizerInf> lookupTable = {
     {{ SCENE_MARKET_NIGHT, 3728 },               RAND_INF_MASK_SHOP_UNLOCKED },
     {{ SCENE_MARKET_DAY, 2495 },                 RAND_INF_MARKET_SHOOTING_GALLERY_UNLOCKED },
     {{ SCENE_MARKET_NIGHT, 2703 },               RAND_INF_MARKET_SHOOTING_GALLERY_UNLOCKED },
-    {{ SCENE_SHOOTING_GALLERY, 447 },            RAND_INF_MARKET_SHOOTING_GALLERY_UNLOCKED },
     {{ SCENE_MARKET_DAY, 5567 },                 RAND_INF_BOMBCHU_BOWLING_UNLOCKED },
     {{ SCENE_MARKET_NIGHT, 5567 },               RAND_INF_BOMBCHU_BOWLING_UNLOCKED },
-    {{ SCENE_BOMBCHU_BOWLING_ALLEY, 447 },       RAND_INF_BOMBCHU_BOWLING_UNLOCKED },
     {{ SCENE_MARKET_DAY, 653 },                  RAND_INF_TREASURE_CHEST_GAME_BUILDING_UNLOCKED },
     {{ SCENE_MARKET_NIGHT, 447 },                RAND_INF_TREASURE_CHEST_GAME_BUILDING_UNLOCKED },
-    {{ SCENE_TREASURE_BOX_SHOP, 6591 },          RAND_INF_TREASURE_CHEST_GAME_BUILDING_UNLOCKED },
     {{ SCENE_BACK_ALLEY_DAY, 2689 },             RAND_INF_BOMBCHU_SHOP_UNLOCKED },
     {{ SCENE_BACK_ALLEY_NIGHT, 2495 },           RAND_INF_BOMBCHU_SHOP_UNLOCKED },
     {{ SCENE_BACK_ALLEY_DAY, 447 },              RAND_INF_RICHARDS_HOUSE_UNLOCKED },
     {{ SCENE_BACK_ALLEY_NIGHT, 447 },            RAND_INF_RICHARDS_HOUSE_UNLOCKED },
-    {{ SCENE_DOG_LADY_HOUSE, 447 },              RAND_INF_RICHARDS_HOUSE_UNLOCKED },
-    {{ SCENE_DOG_LADY_HOUSE, 447 },              RAND_INF_RICHARDS_HOUSE_UNLOCKED },
     {{ SCENE_BACK_ALLEY_HOUSE, 447 },            RAND_INF_ALLEY_HOUSE_UNLOCKED },
     {{ SCENE_BACK_ALLEY_DAY, 1665 },             RAND_INF_ALLEY_HOUSE_UNLOCKED },
-    {{ SCENE_BACK_ALLEY_NIGHT, 1471 },           RAND_INF_ALLEY_HOUSE_UNLOCKED },
     {{ SCENE_KAKARIKO_VILLAGE, 6801 },           RAND_INF_KAK_BAZAAR_UNLOCKED }, // Adult Night
     {{ SCENE_KAKARIKO_VILLAGE, 6591 },           RAND_INF_KAK_BAZAAR_UNLOCKED }, // Adult Day
     {{ SCENE_KAKARIKO_VILLAGE, 6813 },           RAND_INF_KAK_BAZAAR_UNLOCKED }, // Child Day
@@ -51,35 +44,47 @@ std::map<SceneDoorParamsPair, RandomizerInf> lookupTable = {
     {{ SCENE_KAKARIKO_VILLAGE, 7822 },           RAND_INF_KAK_POTION_SHOP_UNLOCKED }, // Adult Night
     {{ SCENE_KAKARIKO_VILLAGE, 7615 },           RAND_INF_KAK_POTION_SHOP_UNLOCKED }, // Child Day/Night and Adult Day
     {{ SCENE_KAKARIKO_VILLAGE, 2495 },           RAND_INF_BOSS_HOUSE_UNLOCKED },
-    {{ SCENE_KAKARIKO_CENTER_GUEST_HOUSE, 447 }, RAND_INF_BOSS_HOUSE_UNLOCKED },
     {{ SCENE_KAKARIKO_VILLAGE, 3750 },           RAND_INF_GRANNYS_POTION_SHOP_UNLOCKED }, // Child
     {{ SCENE_KAKARIKO_VILLAGE, 3519 },           RAND_INF_GRANNYS_POTION_SHOP_UNLOCKED }, // Adult
-    {{ SCENE_POTION_SHOP_GRANNY, 447 },          RAND_INF_GRANNYS_POTION_SHOP_UNLOCKED },
     {{ SCENE_KAKARIKO_VILLAGE, 5567 },           RAND_INF_SKULLTULA_HOUSE_UNLOCKED },
-    {{ SCENE_HOUSE_OF_SKULLTULA, 447 },          RAND_INF_SKULLTULA_HOUSE_UNLOCKED },
     {{ SCENE_KAKARIKO_VILLAGE, 1471 },           RAND_INF_IMPAS_HOUSE_UNLOCKED },
-    {{ SCENE_IMPAS_HOUSE, 447 },                 RAND_INF_IMPAS_HOUSE_UNLOCKED },
     {{ SCENE_KAKARIKO_VILLAGE, 447 },            RAND_INF_WINDMILL_UNLOCKED },
-    {{ SCENE_WINDMILL_AND_DAMPES_GRAVE, 2495 },  RAND_INF_WINDMILL_UNLOCKED },
     {{ SCENE_KAKARIKO_VILLAGE, 4543 },           RAND_INF_KAK_SHOOTING_GALLERY_UNLOCKED }, // Day
     {{ SCENE_KAKARIKO_VILLAGE, 4751 },           RAND_INF_KAK_SHOOTING_GALLERY_UNLOCKED }, // Night
-    {{ SCENE_SHOOTING_GALLERY, 447 },            RAND_INF_KAK_SHOOTING_GALLERY_UNLOCKED },
     {{ SCENE_GRAVEYARD, 645 },                   RAND_INF_DAMPES_HUT_UNLOCKED }, // Child Day
     {{ SCENE_GRAVEYARD, 447 },                   RAND_INF_DAMPES_HUT_UNLOCKED }, // Child Evening & Adult
     {{ SCENE_GRAVEYARD, 774 },                   RAND_INF_DAMPES_HUT_UNLOCKED }, // Child Night (After Dampes Tour)
-    {{ SCENE_GRAVEKEEPERS_HUT, 447 },            RAND_INF_DAMPES_HUT_UNLOCKED },
     {{ SCENE_LON_LON_RANCH, 2495 },              RAND_INF_TALONS_HOUSE_UNLOCKED },
     {{ SCENE_LON_LON_RANCH, 2473 },              RAND_INF_TALONS_HOUSE_UNLOCKED },
     {{ SCENE_LON_LON_RANCH, 2729 },              RAND_INF_TALONS_HOUSE_UNLOCKED },
-    {{ SCENE_LON_LON_BUILDINGS, 1471 },          RAND_INF_TALONS_HOUSE_UNLOCKED },
     {{ SCENE_LON_LON_RANCH, 1471 },              RAND_INF_STABLES_UNLOCKED },
-    {{ SCENE_STABLE, 447 },                      RAND_INF_STABLES_UNLOCKED },
     {{ SCENE_LON_LON_RANCH, 447 },               RAND_INF_BACK_TOWER_UNLOCKED },
-    {{ SCENE_LON_LON_BUILDINGS, 447 },           RAND_INF_BACK_TOWER_UNLOCKED },
     {{ SCENE_LAKE_HYLIA, 447 },                  RAND_INF_HYLIA_LAB_UNLOCKED },
-    {{ SCENE_LAKESIDE_LABORATORY, 447 },         RAND_INF_HYLIA_LAB_UNLOCKED },
     {{ SCENE_LAKE_HYLIA, 1471 },                 RAND_INF_FISHING_HOLE_UNLOCKED },
+    // Doors below this are the insides of the interior areas. In entrance rando, this meant you could
+    // very easily get stuck inside these areas. Outside of entrance rando, you wouldn't be able
+    // to enter these areas without unlocking the outside door anyway, so for now they're
+    // commented out just in case someone else wants to use them for something in the future.
+    /*
+    {{ SCENE_MARKET_GUARD_HOUSE, 447 },          RAND_INF_GUARD_HOUSE_UNLOCKED },
+    {{ SCENE_SHOOTING_GALLERY, 447 },            RAND_INF_MARKET_SHOOTING_GALLERY_UNLOCKED },
+    {{ SCENE_BOMBCHU_BOWLING_ALLEY, 447 },       RAND_INF_BOMBCHU_BOWLING_UNLOCKED },
+    {{ SCENE_TREASURE_BOX_SHOP, 6591 },          RAND_INF_TREASURE_CHEST_GAME_BUILDING_UNLOCKED },
+    {{ SCENE_DOG_LADY_HOUSE, 447 },              RAND_INF_RICHARDS_HOUSE_UNLOCKED },
+    {{ SCENE_BACK_ALLEY_NIGHT, 1471 },           RAND_INF_ALLEY_HOUSE_UNLOCKED },
+    {{ SCENE_KAKARIKO_CENTER_GUEST_HOUSE, 447 }, RAND_INF_BOSS_HOUSE_UNLOCKED },
+    {{ SCENE_POTION_SHOP_GRANNY, 447 },          RAND_INF_GRANNYS_POTION_SHOP_UNLOCKED },
+    {{ SCENE_HOUSE_OF_SKULLTULA, 447 },          RAND_INF_SKULLTULA_HOUSE_UNLOCKED },
+    {{ SCENE_IMPAS_HOUSE, 447 },                 RAND_INF_IMPAS_HOUSE_UNLOCKED },
+    {{ SCENE_WINDMILL_AND_DAMPES_GRAVE, 2495 },  RAND_INF_WINDMILL_UNLOCKED },
+    {{ SCENE_SHOOTING_GALLERY, 447 },            RAND_INF_KAK_SHOOTING_GALLERY_UNLOCKED },
+    {{ SCENE_GRAVEKEEPERS_HUT, 447 },            RAND_INF_DAMPES_HUT_UNLOCKED },
+    {{ SCENE_LON_LON_BUILDINGS, 1471 },          RAND_INF_TALONS_HOUSE_UNLOCKED },
+    {{ SCENE_STABLE, 447 },                      RAND_INF_STABLES_UNLOCKED },
+    {{ SCENE_LON_LON_BUILDINGS, 447 },           RAND_INF_BACK_TOWER_UNLOCKED },
+    {{ SCENE_LAKESIDE_LABORATORY, 447 },         RAND_INF_HYLIA_LAB_UNLOCKED },
     {{ SCENE_FISHING_POND, 447 },                RAND_INF_FISHING_HOLE_UNLOCKED },
+    */
 };
 
 static void OnDoorInit(void* actorRef) {
@@ -88,12 +93,7 @@ static void OnDoorInit(void* actorRef) {
 
     auto it = lookupTable.find({gPlayState->sceneNum, enDoor->actor.params});
     if (it != lookupTable.end()) {
-        if (it->second == RAND_INF_MARKET_SHOOTING_GALLERY_UNLOCKED && gSaveContext.entranceIndex == 0x3B) {
+        enDoor->randomizerInf = it->second;
-            // Adult shooting gallery uses same scene and door params as child, so we manually handle it
-            enDoor->randomizerInf = RAND_INF_KAK_SHOOTING_GALLERY_UNLOCKED;
-        } else {
-            enDoor->randomizerInf = it->second;
-        }
         if (!Flags_GetRandomizerInf(enDoor->randomizerInf)) {
             // We don't want to override checkable doors, we still want those to not be openable even if they have a key
             if (((enDoor->actor.params >> 7) & 7) != DOOR_CHECKABLE) {