Revert change to temple map names

8 files changed, 56 insertions, 55 deletions

diff --git a/mm/2s2h/Rando/ConvertItem.cpp b/mm/2s2h/Rando/ConvertItem.cpp
index f172c6e1b..d724f18af 100644
--- a/mm/2s2h/Rando/ConvertItem.cpp
+++ b/mm/2s2h/Rando/ConvertItem.cpp
@@ -285,25 +285,25 @@ bool Rando::IsItemObtainable(RandoItemId randoItemId, RandoCheckId randoCheckId)
             return !CHECK_DUNGEON_ITEM(DUNGEON_BOSS_KEY, DUNGEON_INDEX_WOODFALL_TEMPLE);
         case RI_WOODFALL_COMPASS:
             return !CHECK_DUNGEON_ITEM(DUNGEON_COMPASS, DUNGEON_INDEX_WOODFALL_TEMPLE);
-        case RI_WOODFALL_TEMPLE_MAP:
+        case RI_WOODFALL_MAP:
             return !CHECK_DUNGEON_ITEM(DUNGEON_MAP, DUNGEON_INDEX_WOODFALL_TEMPLE);
         case RI_SNOWHEAD_BOSS_KEY:
             return !CHECK_DUNGEON_ITEM(DUNGEON_BOSS_KEY, DUNGEON_INDEX_SNOWHEAD_TEMPLE);
         case RI_SNOWHEAD_COMPASS:
             return !CHECK_DUNGEON_ITEM(DUNGEON_COMPASS, DUNGEON_INDEX_SNOWHEAD_TEMPLE);
-        case RI_SNOWHEAD_TEMPLE_MAP:
+        case RI_SNOWHEAD_MAP:
             return !CHECK_DUNGEON_ITEM(DUNGEON_MAP, DUNGEON_INDEX_SNOWHEAD_TEMPLE);
         case RI_GREAT_BAY_BOSS_KEY:
             return !CHECK_DUNGEON_ITEM(DUNGEON_BOSS_KEY, DUNGEON_INDEX_GREAT_BAY_TEMPLE);
         case RI_GREAT_BAY_COMPASS:
             return !CHECK_DUNGEON_ITEM(DUNGEON_COMPASS, DUNGEON_INDEX_GREAT_BAY_TEMPLE);
-        case RI_GREAT_BAY_TEMPLE_MAP:
+        case RI_GREAT_BAY_MAP:
             return !CHECK_DUNGEON_ITEM(DUNGEON_MAP, DUNGEON_INDEX_GREAT_BAY_TEMPLE);
         case RI_STONE_TOWER_BOSS_KEY:
             return !CHECK_DUNGEON_ITEM(DUNGEON_BOSS_KEY, DUNGEON_INDEX_STONE_TOWER_TEMPLE);
         case RI_STONE_TOWER_COMPASS:
             return !CHECK_DUNGEON_ITEM(DUNGEON_COMPASS, DUNGEON_INDEX_STONE_TOWER_TEMPLE);
-        case RI_STONE_TOWER_TEMPLE_MAP:
+        case RI_STONE_TOWER_MAP:
             return !CHECK_DUNGEON_ITEM(DUNGEON_MAP, DUNGEON_INDEX_STONE_TOWER_TEMPLE);
         // These items are technically fine to receive again because they don't do anything, but we'll convert them to
         // ensure it's clear to the player something didn't go wrong.
diff --git a/mm/2s2h/Rando/GiveItem.cpp b/mm/2s2h/Rando/GiveItem.cpp
index 361ab162f..98c7f8266 100644
--- a/mm/2s2h/Rando/GiveItem.cpp
+++ b/mm/2s2h/Rando/GiveItem.cpp
@@ -44,7 +44,7 @@ void Rando::GiveItem(RandoItemId randoItemId) {
         // Don't love this because it doesn't hit GameInteractor_ExecuteOnItemGive()
         // but not sure how else to account for collecting outside of dungeon
         case RI_WOODFALL_BOSS_KEY:
-        case RI_WOODFALL_TEMPLE_MAP:
+        case RI_WOODFALL_MAP:
         case RI_WOODFALL_COMPASS:
             SET_DUNGEON_ITEM(Rando::StaticData::Items[randoItemId].itemId - ITEM_KEY_BOSS,
                              DUNGEON_INDEX_WOODFALL_TEMPLE);
@@ -59,7 +59,7 @@ void Rando::GiveItem(RandoItemId randoItemId) {
             }
             break;
         case RI_SNOWHEAD_BOSS_KEY:
-        case RI_SNOWHEAD_TEMPLE_MAP:
+        case RI_SNOWHEAD_MAP:
         case RI_SNOWHEAD_COMPASS:
             SET_DUNGEON_ITEM(Rando::StaticData::Items[randoItemId].itemId - ITEM_KEY_BOSS,
                              DUNGEON_INDEX_SNOWHEAD_TEMPLE);
@@ -74,7 +74,7 @@ void Rando::GiveItem(RandoItemId randoItemId) {
             }
             break;
         case RI_GREAT_BAY_BOSS_KEY:
-        case RI_GREAT_BAY_TEMPLE_MAP:
+        case RI_GREAT_BAY_MAP:
         case RI_GREAT_BAY_COMPASS:
             SET_DUNGEON_ITEM(Rando::StaticData::Items[randoItemId].itemId - ITEM_KEY_BOSS,
                              DUNGEON_INDEX_GREAT_BAY_TEMPLE);
@@ -89,7 +89,7 @@ void Rando::GiveItem(RandoItemId randoItemId) {
             }
             break;
         case RI_STONE_TOWER_BOSS_KEY:
-        case RI_STONE_TOWER_TEMPLE_MAP:
+        case RI_STONE_TOWER_MAP:
         case RI_STONE_TOWER_COMPASS:
             SET_DUNGEON_ITEM(Rando::StaticData::Items[randoItemId].itemId - ITEM_KEY_BOSS,
                              DUNGEON_INDEX_STONE_TOWER_TEMPLE);
@@ -172,27 +172,27 @@ void Rando::GiveItem(RandoItemId randoItemId) {
 
             Item_Give(gPlayState, Rando::StaticData::Items[randoItemId].itemId);
             break;
-        case RI_CLOCK_TOWN_MAP:
+        case RI_TINGLE_MAP_CLOCK_TOWN:
             Inventory_SetWorldMapCloudVisibility(TINGLE_MAP_CLOCK_TOWN);
             SET_WEEKEVENTREG(WEEKEVENTREG_TINGLE_MAP_BOUGHT_CLOCK_TOWN);
             break;
-        case RI_WOODFALL_MAP:
+        case RI_TINGLE_MAP_WOODFALL:
             Inventory_SetWorldMapCloudVisibility(TINGLE_MAP_WOODFALL);
             SET_WEEKEVENTREG(WEEKEVENTREG_TINGLE_MAP_BOUGHT_WOODFALL);
             break;
-        case RI_GREAT_BAY_MAP:
+        case RI_TINGLE_MAP_GREAT_BAY:
             Inventory_SetWorldMapCloudVisibility(TINGLE_MAP_SNOWHEAD);
             SET_WEEKEVENTREG(WEEKEVENTREG_TINGLE_MAP_BOUGHT_SNOWHEAD);
             break;
-        case RI_ROMANI_RANCH_MAP:
+        case RI_TINGLE_MAP_ROMANI_RANCH:
             Inventory_SetWorldMapCloudVisibility(TINGLE_MAP_ROMANI_RANCH);
             SET_WEEKEVENTREG(WEEKEVENTREG_TINGLE_MAP_BOUGHT_ROMANI_RANCH);
             break;
-        case RI_SNOWHEAD_MAP:
+        case RI_TINGLE_MAP_SNOWHEAD:
             Inventory_SetWorldMapCloudVisibility(TINGLE_MAP_GREAT_BAY);
             SET_WEEKEVENTREG(WEEKEVENTREG_TINGLE_MAP_BOUGHT_GREAT_BAY);
             break;
-        case RI_STONE_TOWER_MAP:
+        case RI_TINGLE_MAP_STONE_TOWER:
             Inventory_SetWorldMapCloudVisibility(TINGLE_MAP_STONE_TOWER);
             SET_WEEKEVENTREG(WEEKEVENTREG_TINGLE_MAP_BOUGHT_STONE_TOWER);
             break;
diff --git a/mm/2s2h/Rando/Logic/GlitchlessLogic.cpp b/mm/2s2h/Rando/Logic/GlitchlessLogic.cpp
index 1690e6c38..cd0187fcf 100644
--- a/mm/2s2h/Rando/Logic/GlitchlessLogic.cpp
+++ b/mm/2s2h/Rando/Logic/GlitchlessLogic.cpp
@@ -30,10 +30,10 @@ void ApplyGlitchlessLogicToSaveContext() {
     // happen prior to these items being in logic. Each time an item is logically placed, it should be removed from this
     // section.
     std::vector<RandoItemId> startingItems = {
-        RI_SONG_EPONA,  RI_ARROW_FIRE,         RI_POWDER_KEG,  RI_MASK_GORON,     RI_DEED_MOUNTAIN, RI_MAGIC_BEAN,
-        RI_SONG_STORMS, RI_SONG_NOVA,          RI_MASK_GARO,   RI_SONG_ELEGY,     RI_ARROW_LIGHT,   RI_ARROW_ICE,
-        RI_LENS,        RI_BLUE_POTION_REFILL, RI_MASK_COUPLE, RI_MASK_ALL_NIGHT, RI_SONG_LULLABY,  RI_DEKU_STICK,
-        RI_DEKU_NUT,
+        RI_SONG_EPONA,     RI_ARROW_FIRE,   RI_POWDER_KEG, RI_MASK_GORON,         RI_DEED_MOUNTAIN,
+        RI_MAGIC_BEAN,     RI_SONG_STORMS,  RI_SONG_NOVA,  RI_MASK_GARO,          RI_SONG_ELEGY,
+        RI_ARROW_LIGHT,    RI_ARROW_ICE,    RI_LENS,       RI_BLUE_POTION_REFILL, RI_MASK_COUPLE,
+        RI_MASK_ALL_NIGHT, RI_SONG_LULLABY, RI_DEKU_STICK, RI_DEKU_NUT,
     };
 
     for (RandoItemId randoItemId : startingItems) {
diff --git a/mm/2s2h/Rando/RemoveItem.cpp b/mm/2s2h/Rando/RemoveItem.cpp
index 782429545..1de95e2ad 100644
--- a/mm/2s2h/Rando/RemoveItem.cpp
+++ b/mm/2s2h/Rando/RemoveItem.cpp
@@ -37,7 +37,7 @@ void Rando::RemoveItem(RandoItemId randoItemId) {
             gSaveContext.save.saveInfo.playerData.isDoubleMagicAcquired = false;
             break;
         case RI_WOODFALL_BOSS_KEY:
-        case RI_WOODFALL_TEMPLE_MAP:
+        case RI_WOODFALL_MAP:
         case RI_WOODFALL_COMPASS:
             REMOVE_DUNGEON_ITEM(Rando::StaticData::Items[randoItemId].itemId - ITEM_KEY_BOSS,
                                 DUNGEON_INDEX_WOODFALL_TEMPLE);
@@ -47,7 +47,7 @@ void Rando::RemoveItem(RandoItemId randoItemId) {
             gSaveContext.save.shipSaveInfo.rando.foundDungeonKeys[DUNGEON_INDEX_WOODFALL_TEMPLE]--;
             break;
         case RI_SNOWHEAD_BOSS_KEY:
-        case RI_SNOWHEAD_TEMPLE_MAP:
+        case RI_SNOWHEAD_MAP:
         case RI_SNOWHEAD_COMPASS:
             REMOVE_DUNGEON_ITEM(Rando::StaticData::Items[randoItemId].itemId - ITEM_KEY_BOSS,
                                 DUNGEON_INDEX_SNOWHEAD_TEMPLE);
@@ -57,7 +57,7 @@ void Rando::RemoveItem(RandoItemId randoItemId) {
             gSaveContext.save.shipSaveInfo.rando.foundDungeonKeys[DUNGEON_INDEX_WOODFALL_TEMPLE]--;
             break;
         case RI_GREAT_BAY_BOSS_KEY:
-        case RI_GREAT_BAY_TEMPLE_MAP:
+        case RI_GREAT_BAY_MAP:
         case RI_GREAT_BAY_COMPASS:
             REMOVE_DUNGEON_ITEM(Rando::StaticData::Items[randoItemId].itemId - ITEM_KEY_BOSS,
                                 DUNGEON_INDEX_GREAT_BAY_TEMPLE);
@@ -67,7 +67,7 @@ void Rando::RemoveItem(RandoItemId randoItemId) {
             gSaveContext.save.shipSaveInfo.rando.foundDungeonKeys[DUNGEON_INDEX_WOODFALL_TEMPLE]--;
             break;
         case RI_STONE_TOWER_BOSS_KEY:
-        case RI_STONE_TOWER_TEMPLE_MAP:
+        case RI_STONE_TOWER_MAP:
         case RI_STONE_TOWER_COMPASS:
             REMOVE_DUNGEON_ITEM(Rando::StaticData::Items[randoItemId].itemId - ITEM_KEY_BOSS,
                                 DUNGEON_INDEX_STONE_TOWER_TEMPLE);
diff --git a/mm/2s2h/Rando/StaticData/Checks.cpp b/mm/2s2h/Rando/StaticData/Checks.cpp
index 3d0c3cc80..0bd5d3c9e 100644
--- a/mm/2s2h/Rando/StaticData/Checks.cpp
+++ b/mm/2s2h/Rando/StaticData/Checks.cpp
@@ -42,8 +42,8 @@ std::map<RandoCheckId, RandoStaticCheck> Checks = {
     RC(RC_CLOCK_TOWN_GREAT_FAIRY,                               RCTYPE_NPC,              SCENE_YOUSEI_IZUMI,             FLAG_NONE,                   0x00,                                                                RI_PROGRESSIVE_MAGIC),
     RC(RC_CLOCK_TOWN_LAUNDRY_GURU_GURU,                         RCTYPE_NPC,              SCENE_ALLEY,                    FLAG_WEEK_EVENT_REG,         WEEKEVENTREG_38_40,                                                  RI_MASK_BREMEN),
     RC(RC_CLOCK_TOWN_NORTH_BOMB_LADY,                           RCTYPE_NPC,              SCENE_BACKTOWN,                 FLAG_CYCL_SCENE_COLLECTIBLE, WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_RECEIVED_BLAST_MASK,             RI_MASK_BLAST),
-    RC(RC_CLOCK_TOWN_NORTH_TINGLE_MAP_1,                        RCTYPE_NPC,              SCENE_BACKTOWN,                 FLAG_NONE,                   0x00,                                                                RI_CLOCK_TOWN_MAP),
-    RC(RC_CLOCK_TOWN_NORTH_TINGLE_MAP_2,                        RCTYPE_NPC,              SCENE_BACKTOWN,                 FLAG_NONE,                   0x00,                                                                RI_WOODFALL_MAP),
+    RC(RC_CLOCK_TOWN_NORTH_TINGLE_MAP_1,                        RCTYPE_NPC,              SCENE_BACKTOWN,                 FLAG_NONE,                   0x00,                                                                RI_TINGLE_MAP_CLOCK_TOWN),
+    RC(RC_CLOCK_TOWN_NORTH_TINGLE_MAP_2,                        RCTYPE_NPC,              SCENE_BACKTOWN,                 FLAG_NONE,                   0x00,                                                                RI_TINGLE_MAP_WOODFALL),
     RC(RC_CLOCK_TOWN_NORTH_TREE_HP,                             RCTYPE_FREESTANDING,     SCENE_BACKTOWN,                 FLAG_CYCL_SCENE_COLLECTIBLE, 0x0A,                                                                RI_HEART_PIECE),
     RC(RC_CLOCK_TOWN_SCRUB_DEED,                                RCTYPE_NPC,              SCENE_CLOCKTOWER,               FLAG_WEEK_EVENT_REG,         WEEKEVENTREG_17_80,                                                  RI_DEED_LAND),
     RC(RC_CLOCK_TOWN_SOUTH_CHEST_LOWER,                         RCTYPE_CHEST,            SCENE_CLOCKTOWER,               FLAG_CYCL_SCENE_CHEST,       0x00,                                                                RI_RUPEE_RED),
@@ -76,8 +76,8 @@ std::map<RandoCheckId, RandoStaticCheck> Checks = {
     RC(RC_GREAT_BAY_COAST_MIKAU,                                RCTYPE_NPC,              SCENE_30GYOSON,                 FLAG_NONE,                   0x00,                                                                RI_MASK_ZORA),
     RC(RC_GREAT_BAY_COAST_NEW_WAVE_BOSSA_NOVA,                  RCTYPE_NPC,              SCENE_LABO,                     FLAG_WEEK_EVENT_REG,         WEEKEVENTREG_20_40,                                                  RI_SONG_NOVA),
     RC(RC_GREAT_BAY_COAST_OWL_STATUE,                           RCTYPE_OWL,              SCENE_30GYOSON,                 FLAG_NONE,                   0x00,                                                                RI_OWL_GREAT_BAY_COAST),
-    RC(RC_GREAT_BAY_COAST_TINGLE_MAP_1,                         RCTYPE_NPC,              SCENE_30GYOSON,                 FLAG_NONE,                   0x00,                                                                RI_GREAT_BAY_MAP),
-    RC(RC_GREAT_BAY_COAST_TINGLE_MAP_2,                         RCTYPE_NPC,              SCENE_30GYOSON,                 FLAG_NONE,                   0x00,                                                                RI_STONE_TOWER_MAP),
+    RC(RC_GREAT_BAY_COAST_TINGLE_MAP_1,                         RCTYPE_NPC,              SCENE_30GYOSON,                 FLAG_NONE,                   0x00,                                                                RI_TINGLE_MAP_GREAT_BAY),
+    RC(RC_GREAT_BAY_COAST_TINGLE_MAP_2,                         RCTYPE_NPC,              SCENE_30GYOSON,                 FLAG_NONE,                   0x00,                                                                RI_TINGLE_MAP_STONE_TOWER),
     RC(RC_GREAT_BAY_GREAT_FAIRY,                                RCTYPE_NPC,              SCENE_YOUSEI_IZUMI,             FLAG_NONE,                   0x00,                                                                RI_DOUBLE_DEFENSE),
     RC(RC_GREAT_BAY_TEMPLE_BABA_CHEST,                          RCTYPE_CHEST,            SCENE_SEA,                      FLAG_CYCL_SCENE_CHEST,       0x19,                                                                RI_GREAT_BAY_STRAY_FAIRY),
     RC(RC_GREAT_BAY_TEMPLE_BOSS_HC,                             RCTYPE_FREESTANDING,     SCENE_SEA_BS,                   FLAG_CYCL_SCENE_COLLECTIBLE, 0x1f,                                                                RI_HEART_CONTAINER),
@@ -91,7 +91,7 @@ std::map<RandoCheckId, RandoStaticCheck> Checks = {
     RC(RC_GREAT_BAY_TEMPLE_GREEN_PIPE_2_UPPER_CHEST,            RCTYPE_CHEST,            SCENE_SEA,                      FLAG_CYCL_SCENE_CHEST,       0x14,                                                                RI_GREAT_BAY_STRAY_FAIRY),
     RC(RC_GREAT_BAY_TEMPLE_GREEN_PIPE_3_CHEST,                  RCTYPE_CHEST,            SCENE_SEA,                      FLAG_CYCL_SCENE_CHEST,       0x16,                                                                RI_GREAT_BAY_STRAY_FAIRY),
     RC(RC_GREAT_BAY_TEMPLE_ICE_ARROW,                           RCTYPE_CHEST,            SCENE_SEA,                      FLAG_CYCL_SCENE_CHEST,       0x1B,                                                                RI_ARROW_ICE),
-    RC(RC_GREAT_BAY_TEMPLE_MAP,                                 RCTYPE_CHEST,            SCENE_SEA,                      FLAG_CYCL_SCENE_CHEST,       0x1D,                                                                RI_GREAT_BAY_TEMPLE_MAP),
+    RC(RC_GREAT_BAY_TEMPLE_MAP,                                 RCTYPE_CHEST,            SCENE_SEA,                      FLAG_CYCL_SCENE_CHEST,       0x1D,                                                                RI_GREAT_BAY_MAP),
     RC(RC_GREAT_BAY_TEMPLE_SF_CENTRAL_ROOM_BARREL,              RCTYPE_STRAY_FAIRY,      SCENE_SEA,                      FLAG_CYCL_SCENE_COLLECTIBLE, 0x1C,                                                                RI_GREAT_BAY_STRAY_FAIRY),
     RC(RC_GREAT_BAY_TEMPLE_SF_CENTRAL_ROOM_UNDERWATER_POT,      RCTYPE_STRAY_FAIRY,      SCENE_SEA,                      FLAG_CYCL_SCENE_COLLECTIBLE, 0x1B,                                                                RI_GREAT_BAY_STRAY_FAIRY),
     RC(RC_GREAT_BAY_TEMPLE_SF_COMPASS_ROOM_POT,                 RCTYPE_STRAY_FAIRY,      SCENE_SEA,                      FLAG_CYCL_SCENE_COLLECTIBLE, 0x1D,                                                                RI_GREAT_BAY_STRAY_FAIRY),
@@ -109,8 +109,8 @@ std::map<RandoCheckId, RandoStaticCheck> Checks = {
     RC(RC_IKANA_CANYON_SCRUB_HP,                                RCTYPE_FREESTANDING,     SCENE_IKANA,                    FLAG_CYCL_SCENE_COLLECTIBLE, 0x1e,                                                                RI_HEART_PIECE),
     RC(RC_IKANA_CANYON_SCRUB_HUGE_RUPEE,                        RCTYPE_NPC,              SCENE_IKANA,                    FLAG_WEEK_EVENT_REG,         WEEKEVENTREG_62_20,                                                  RI_RUPEE_HUGE),
     RC(RC_IKANA_CANYON_SCRUB_POTION_REFILL,                     RCTYPE_NPC,              SCENE_IKANA,                    FLAG_RANDO_INF,              RANDO_INF_PURCHASED_POTION_FROM_IKANA_CANYON_SCRUB,                  RI_BLUE_POTION_REFILL),
-    RC(RC_IKANA_CANYON_TINGLE_MAP_1,                            RCTYPE_NPC,              SCENE_IKANA,                    FLAG_NONE,                   0x00,                                                                RI_STONE_TOWER_MAP),
-    RC(RC_IKANA_CANYON_TINGLE_MAP_2,                            RCTYPE_NPC,              SCENE_IKANA,                    FLAG_NONE,                   0x00,                                                                RI_CLOCK_TOWN_MAP),
+    RC(RC_IKANA_CANYON_TINGLE_MAP_1,                            RCTYPE_NPC,              SCENE_IKANA,                    FLAG_NONE,                   0x00,                                                                RI_TINGLE_MAP_STONE_TOWER),
+    RC(RC_IKANA_CANYON_TINGLE_MAP_2,                            RCTYPE_NPC,              SCENE_IKANA,                    FLAG_NONE,                   0x00,                                                                RI_TINGLE_MAP_CLOCK_TOWN),
     RC(RC_IKANA_GRAVEYARD_CAPTAIN_MASK,                         RCTYPE_CHEST,            SCENE_BOTI,                     FLAG_CYCL_SCENE_CHEST,       0x00,                                                                RI_MASK_CAPTAIN),
     RC(RC_IKANA_GRAVEYARD_GROTTO,                               RCTYPE_CHEST,            SCENE_KAKUSIANA,                FLAG_CYCL_SCENE_CHEST,       0x18,                                                                RI_BOMBCHU_5),
     RC(RC_IKANA_GREAT_FAIRY,                                    RCTYPE_NPC,              SCENE_YOUSEI_IZUMI,             FLAG_NONE,                   0x00,                                                                RI_GREAT_FAIRY_SWORD),
@@ -121,8 +121,8 @@ std::map<RandoCheckId, RandoStaticCheck> Checks = {
     RC(RC_MAYORS_OFFICE_HP,                                     RCTYPE_NPC,              SCENE_SONCHONOIE,               FLAG_WEEK_EVENT_REG,         WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_RECEIVED_MAYOR_HP,               RI_HEART_PIECE),
     RC(RC_MAYORS_OFFICE_KAFEIS_MASK,                            RCTYPE_NPC,              SCENE_SONCHONOIE,               FLAG_WEEK_EVENT_REG,         WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_RECEIVED_KAFEIS_MASK,            RI_MASK_KAFEIS_MASK),
     RC(RC_MILK_ROAD_OWL_STATUE,                                 RCTYPE_OWL,              SCENE_ROMANYMAE,                FLAG_NONE,                   0x00,                                                                RI_OWL_MILK_ROAD),
-    RC(RC_MILK_ROAD_TINGLE_MAP_1,                               RCTYPE_NPC,              SCENE_ROMANYMAE,                FLAG_NONE,                   0x00,                                                                RI_ROMANI_RANCH_MAP),
-    RC(RC_MILK_ROAD_TINGLE_MAP_2,                               RCTYPE_NPC,              SCENE_ROMANYMAE,                FLAG_NONE,                   0x00,                                                                RI_GREAT_BAY_MAP),
+    RC(RC_MILK_ROAD_TINGLE_MAP_1,                               RCTYPE_NPC,              SCENE_ROMANYMAE,                FLAG_NONE,                   0x00,                                                                RI_TINGLE_MAP_ROMANI_RANCH),
+    RC(RC_MILK_ROAD_TINGLE_MAP_2,                               RCTYPE_NPC,              SCENE_ROMANYMAE,                FLAG_NONE,                   0x00,                                                                RI_TINGLE_MAP_GREAT_BAY),
     RC(RC_MOON_TRIAL_DEKU_HP,                                   RCTYPE_FREESTANDING,     SCENE_LAST_DEKU,                FLAG_CYCL_SCENE_COLLECTIBLE, 0x01,                                                                RI_HEART_PIECE),
     RC(RC_MOON_TRIAL_GORON_HP,                                  RCTYPE_FREESTANDING,     SCENE_LAST_GORON,               FLAG_CYCL_SCENE_COLLECTIBLE, 0x01,                                                                RI_HEART_PIECE),
     RC(RC_MOON_TRIAL_LINK_GARO_MASTER_CHEST,                    RCTYPE_CHEST,            SCENE_LAST_LINK,                FLAG_CYCL_SCENE_CHEST,       0x01,                                                                RI_ARROWS_30),
@@ -190,8 +190,8 @@ std::map<RandoCheckId, RandoStaticCheck> Checks = {
     RC(RC_ROAD_TO_IKANA_STONE_MASK,                             RCTYPE_NPC,              SCENE_KAKUSIANA,                FLAG_WEEK_EVENT_REG,         WEEKEVENTREG_41_40,                                                  RI_MASK_STONE),
     RC(RC_ROAD_TO_SOUTHERN_SWAMP_GROTTO,                        RCTYPE_CHEST,            SCENE_KAKUSIANA,                FLAG_CYCL_SCENE_CHEST,       0x1e,                                                                RI_RUPEE_RED),
     RC(RC_ROAD_TO_SOUTHERN_SWAMP_HP,                            RCTYPE_FREESTANDING,     SCENE_24KEMONOMITI,             FLAG_CYCL_SCENE_COLLECTIBLE, 0x01,                                                                RI_HEART_PIECE),
-    RC(RC_ROAD_TO_SOUTHERN_SWAMP_TINGLE_MAP_1,                  RCTYPE_NPC,              SCENE_24KEMONOMITI,             FLAG_NONE,                   0x00,                                                                RI_WOODFALL_MAP),
-    RC(RC_ROAD_TO_SOUTHERN_SWAMP_TINGLE_MAP_2,                  RCTYPE_NPC,              SCENE_24KEMONOMITI,             FLAG_NONE,                   0x00,                                                                RI_SNOWHEAD_MAP),
+    RC(RC_ROAD_TO_SOUTHERN_SWAMP_TINGLE_MAP_1,                  RCTYPE_NPC,              SCENE_24KEMONOMITI,             FLAG_NONE,                   0x00,                                                                RI_TINGLE_MAP_WOODFALL),
+    RC(RC_ROAD_TO_SOUTHERN_SWAMP_TINGLE_MAP_2,                  RCTYPE_NPC,              SCENE_24KEMONOMITI,             FLAG_NONE,                   0x00,                                                                RI_TINGLE_MAP_SNOWHEAD),
     RC(RC_ROMANI_RANCH_BARN_COW_LEFT,                           RCTYPE_COW,              SCENE_OMOYA,                    FLAG_NONE,                   0x12,                                                                RI_MILK_REFILL),
     RC(RC_ROMANI_RANCH_BARN_COW_MIDDLE,                         RCTYPE_COW,              SCENE_OMOYA,                    FLAG_NONE,                   0x10,                                                                RI_MILK_REFILL),
     RC(RC_ROMANI_RANCH_BARN_COW_RIGHT,                          RCTYPE_COW,              SCENE_OMOYA,                    FLAG_NONE,                   0x11,                                                                RI_MILK_REFILL),
@@ -220,7 +220,7 @@ std::map<RandoCheckId, RandoStaticCheck> Checks = {
     RC(RC_SNOWHEAD_TEMPLE_ICICLE_ROOM_ALCOVE_CHEST,             RCTYPE_CHEST,            SCENE_HAKUGIN,                  FLAG_CYCL_SCENE_CHEST,       0x16,                                                                RI_SNOWHEAD_STRAY_FAIRY),
     RC(RC_SNOWHEAD_TEMPLE_ICICLE_ROOM,                          RCTYPE_CHEST,            SCENE_HAKUGIN,                  FLAG_CYCL_SCENE_CHEST,       0x04,                                                                RI_SNOWHEAD_SMALL_KEY),
     RC(RC_SNOWHEAD_TEMPLE_MAP_ALCOVE_CHEST,                     RCTYPE_CHEST,            SCENE_HAKUGIN,                  FLAG_CYCL_SCENE_CHEST,       0x13,                                                                RI_SNOWHEAD_STRAY_FAIRY),
-    RC(RC_SNOWHEAD_TEMPLE_MAP,                                  RCTYPE_CHEST,            SCENE_HAKUGIN,                  FLAG_CYCL_SCENE_CHEST,       0x1D,                                                                RI_SNOWHEAD_TEMPLE_MAP),
+    RC(RC_SNOWHEAD_TEMPLE_MAP,                                  RCTYPE_CHEST,            SCENE_HAKUGIN,                  FLAG_CYCL_SCENE_CHEST,       0x1D,                                                                RI_SNOWHEAD_MAP),
     RC(RC_SNOWHEAD_TEMPLE_PILLARS_ROOM_CHEST,                   RCTYPE_CHEST,            SCENE_HAKUGIN,                  FLAG_CYCL_SCENE_CHEST,       0x18,                                                                RI_SNOWHEAD_STRAY_FAIRY),
     RC(RC_SNOWHEAD_TEMPLE_SF_BRIDGE_PILLAR,                     RCTYPE_STRAY_FAIRY,      SCENE_HAKUGIN,                  FLAG_CYCL_SCENE_SWITCH,      0x30,                                                                RI_SNOWHEAD_STRAY_FAIRY),
     RC(RC_SNOWHEAD_TEMPLE_SF_BRIDGE_UNDER_PLATFORM,             RCTYPE_STRAY_FAIRY,      SCENE_HAKUGIN,                  FLAG_CYCL_SCENE_SWITCH,      0x2F,                                                                RI_SNOWHEAD_STRAY_FAIRY),
@@ -263,7 +263,7 @@ std::map<RandoCheckId, RandoStaticCheck> Checks = {
     RC(RC_STONE_TOWER_TEMPLE_INVERTED_GIANT_MASK,               RCTYPE_CHEST,            SCENE_INISIE_N,                 FLAG_CYCL_SCENE_CHEST,       0x1a,                                                                RI_MASK_GIANT),
     RC(RC_STONE_TOWER_TEMPLE_INVERTED_WIZZROBE_CHEST,           RCTYPE_CHEST,            SCENE_INISIE_N,                 FLAG_CYCL_SCENE_CHEST,       0x11,                                                                RI_STONE_TOWER_STRAY_FAIRY),
     RC(RC_STONE_TOWER_TEMPLE_LIGHT_ARROW,                       RCTYPE_CHEST,            SCENE_INISIE_N,                 FLAG_CYCL_SCENE_CHEST,       0x1b,                                                                RI_ARROW_LIGHT),
-    RC(RC_STONE_TOWER_TEMPLE_MAP,                               RCTYPE_CHEST,            SCENE_INISIE_N,                 FLAG_CYCL_SCENE_CHEST,       0x1d,                                                                RI_STONE_TOWER_TEMPLE_MAP),
+    RC(RC_STONE_TOWER_TEMPLE_MAP,                               RCTYPE_CHEST,            SCENE_INISIE_N,                 FLAG_CYCL_SCENE_CHEST,       0x1d,                                                                RI_STONE_TOWER_MAP),
     RC(RC_STONE_TOWER_TEMPLE_MIRRORS_ROOM_CENTER_CHEST,         RCTYPE_CHEST,            SCENE_INISIE_N,                 FLAG_CYCL_SCENE_CHEST,       0x0f,                                                                RI_STONE_TOWER_STRAY_FAIRY),
     RC(RC_STONE_TOWER_TEMPLE_MIRRORS_ROOM_RIGHT_CHEST,          RCTYPE_CHEST,            SCENE_INISIE_N,                 FLAG_CYCL_SCENE_CHEST,       0x0b,                                                                RI_STONE_TOWER_STRAY_FAIRY),
     RC(RC_STONE_TOWER_TEMPLE_UNDER_WEST_GARDEN_LAVA_CHEST,      RCTYPE_CHEST,            SCENE_INISIE_N,                 FLAG_CYCL_SCENE_CHEST,       0x02,                                                                RI_STONE_TOWER_SMALL_KEY),
@@ -324,8 +324,8 @@ std::map<RandoCheckId, RandoStaticCheck> Checks = {
     RC(RC_TRADING_POST_SHOP_ITEM_8,                             RCTYPE_SHOP,             SCENE_8ITEMSHOP,                FLAG_NONE,                   0x00,                                                                RI_ARROWS_50),
     RC(RC_TWIN_ISLANDS_FROZEN_GROTTO_CHEST,                     RCTYPE_CHEST,            SCENE_KAKUSIANA,                FLAG_CYCL_SCENE_CHEST,       0x02,                                                                RI_RUPEE_RED),
     RC(RC_TWIN_ISLANDS_RAMP_GROTTO_CHEST,                       RCTYPE_CHEST,            SCENE_KAKUSIANA,                FLAG_CYCL_SCENE_CHEST,       0x19,                                                                RI_BOMBCHU),
-    RC(RC_TWIN_ISLANDS_TINGLE_MAP_1,                            RCTYPE_NPC,              SCENE_17SETUGEN,                FLAG_NONE,                   0x00,                                                                RI_SNOWHEAD_MAP),
-    RC(RC_TWIN_ISLANDS_TINGLE_MAP_2,                            RCTYPE_NPC,              SCENE_17SETUGEN,                FLAG_NONE,                   0x00,                                                                RI_ROMANI_RANCH_MAP),
+    RC(RC_TWIN_ISLANDS_TINGLE_MAP_1,                            RCTYPE_NPC,              SCENE_17SETUGEN,                FLAG_NONE,                   0x00,                                                                RI_TINGLE_MAP_SNOWHEAD),
+    RC(RC_TWIN_ISLANDS_TINGLE_MAP_2,                            RCTYPE_NPC,              SCENE_17SETUGEN,                FLAG_NONE,                   0x00,                                                                RI_TINGLE_MAP_ROMANI_RANCH),
     RC(RC_TWIN_ISLANDS_UNDERWATER_CHEST_1,                      RCTYPE_CHEST,            SCENE_17SETUGEN,                FLAG_CYCL_SCENE_CHEST,       0x06,                                                                RI_HEART_PIECE),
     RC(RC_TWIN_ISLANDS_UNDERWATER_CHEST_2,                      RCTYPE_CHEST,            SCENE_17SETUGEN,                FLAG_CYCL_SCENE_CHEST,       0x00,                                                                RI_RUPEE_RED),
     RC(RC_WOODFALL_ENTRANCE_CHEST,                              RCTYPE_CHEST,            SCENE_21MITURINMAE,             FLAG_CYCL_SCENE_CHEST,       0x00,                                                                RI_RUPEE_RED),
@@ -341,7 +341,7 @@ std::map<RandoCheckId, RandoStaticCheck> Checks = {
     RC(RC_WOODFALL_TEMPLE_COMPASS,                              RCTYPE_CHEST,            SCENE_MITURIN,                  FLAG_CYCL_SCENE_CHEST,       0x1c,                                                                RI_WOODFALL_COMPASS),
     RC(RC_WOODFALL_TEMPLE_DARK_CHEST,                           RCTYPE_CHEST,            SCENE_MITURIN,                  FLAG_CYCL_SCENE_CHEST,       0x19,                                                                RI_WOODFALL_STRAY_FAIRY),
     RC(RC_WOODFALL_TEMPLE_ENTRANCE_CHEST,                       RCTYPE_CHEST,            SCENE_MITURIN,                  FLAG_CYCL_SCENE_CHEST,       0x18,                                                                RI_WOODFALL_STRAY_FAIRY),
-    RC(RC_WOODFALL_TEMPLE_MAP,                                  RCTYPE_CHEST,            SCENE_MITURIN,                  FLAG_CYCL_SCENE_CHEST,       0x1d,                                                                RI_WOODFALL_TEMPLE_MAP),
+    RC(RC_WOODFALL_TEMPLE_MAP,                                  RCTYPE_CHEST,            SCENE_MITURIN,                  FLAG_CYCL_SCENE_CHEST,       0x1d,                                                                RI_WOODFALL_MAP),
     RC(RC_WOODFALL_TEMPLE_SF_ENTRANCE,                          RCTYPE_STRAY_FAIRY,      SCENE_MITURIN,                  FLAG_CYCL_SCENE_SWITCH,      0x2B,                                                                RI_WOODFALL_STRAY_FAIRY),
     RC(RC_WOODFALL_TEMPLE_SF_MAIN_BUBBLE,                       RCTYPE_STRAY_FAIRY,      SCENE_MITURIN,                  FLAG_CYCL_SCENE_SWITCH,      0x30,                                                                RI_WOODFALL_STRAY_FAIRY),
     RC(RC_WOODFALL_TEMPLE_SF_MAIN_DEKU_BABA,                    RCTYPE_STRAY_FAIRY,      SCENE_MITURIN,                  FLAG_CYCL_SCENE_SWITCH,      0x2E,                                                                RI_WOODFALL_STRAY_FAIRY),
diff --git a/mm/2s2h/Rando/StaticData/Items.cpp b/mm/2s2h/Rando/StaticData/Items.cpp
index c2f61b8af..b409ce1ff 100644
--- a/mm/2s2h/Rando/StaticData/Items.cpp
+++ b/mm/2s2h/Rando/StaticData/Items.cpp
@@ -31,7 +31,6 @@ std::map<RandoItemId, RandoStaticItem> Items = {
     RI(RI_BOMBS_5,                    "",     "5 Bombs",                    ITEM_BOMBS_5,                    GI_BOMBS_5,                  GID_BOMB),
     RI(RI_BOTTLE_EMPTY,               "an",   "Empty Bottle",               ITEM_BOTTLE,                     GI_BOTTLE,                   GID_BOTTLE),
     RI(RI_BOW,                        "a",    "Bow",                        ITEM_BOW,                        GI_QUIVER_30,                GID_BOW),
-    RI(RI_CLOCK_TOWN_MAP,             "the",  "Map of Clock Town",          ITEM_TINGLE_MAP,                 GI_TINGLE_MAP_CLOCK_TOWN,    GID_TINGLE_MAP),
     RI(RI_CLOCK_TOWN_STRAY_FAIRY,     "a",    "Clock Town Stray Fairy",     ITEM_STRAY_FAIRIES,              GI_STRAY_FAIRY,              GID_NONE),
     RI(RI_DEED_LAND,                  "the",  "Land Title Deed",            ITEM_DEED_LAND,                  GI_DEED_LAND,                GID_DEED_LAND),
     RI(RI_DEED_MOUNTAIN,              "the",  "Mountain Title Deed",        ITEM_DEED_MOUNTAIN,              GI_DEED_MOUNTAIN,            GID_DEED_MOUNTAIN),
@@ -46,10 +45,9 @@ std::map<RandoItemId, RandoStaticItem> Items = {
     RI(RI_FAIRY_REFILL,               "a",    "Fairy",                      ITEM_FAIRY,                      GI_FAIRY,                    GID_FAIRY_2),
     RI(RI_GREAT_BAY_BOSS_KEY,         "the",  "Great Bay Boss Key",         ITEM_KEY_BOSS,                   GI_KEY_BOSS,                 GID_KEY_BOSS),
     RI(RI_GREAT_BAY_COMPASS,          "the",  "Great Bay Compass",          ITEM_COMPASS,                    GI_COMPASS,                  GID_COMPASS),
-    RI(RI_GREAT_BAY_MAP,              "the",  "Map of Great Bay",           ITEM_TINGLE_MAP,                 GI_TINGLE_MAP_GREAT_BAY,     GID_TINGLE_MAP),
+    RI(RI_GREAT_BAY_MAP,              "the",  "Great Bay Map",              ITEM_DUNGEON_MAP,                GI_MAP,                      GID_DUNGEON_MAP),
     RI(RI_GREAT_BAY_SMALL_KEY,        "a",    "Great Bay Small Key",        ITEM_KEY_SMALL,                  GI_KEY_SMALL,                GID_KEY_SMALL),
     RI(RI_GREAT_BAY_STRAY_FAIRY,      "a",    "Great Bay Stray Fairy",      ITEM_STRAY_FAIRIES,              GI_STRAY_FAIRY,              GID_NONE),
-    RI(RI_GREAT_BAY_TEMPLE_MAP,       "the",  "Great Bay Temple Map",       ITEM_DUNGEON_MAP,                GI_MAP,                      GID_DUNGEON_MAP),
     RI(RI_GREAT_FAIRY_SWORD,          "the",  "Great Fairy's Sword",        ITEM_SWORD_GREAT_FAIRY,          GI_SWORD_GREAT_FAIRY,        GID_SWORD_GREAT_FAIRY),
     RI(RI_GREAT_SPIN_ATTACK,          "the",  "Great Spin Attack",          ITEM_NONE,                       GI_NONE,                     GID_SWORD_KOKIRI),
     RI(RI_GREEN_POTION_REFILL,        "a",    "Green Potion Refill",        ITEM_POTION_GREEN,               GI_POTION_GREEN,             GID_POTION_GREEN),
@@ -110,7 +108,6 @@ std::map<RandoItemId, RandoStaticItem> Items = {
     RI(RI_REMAINS_GYORG,              "",     "Gyorg's Remains",            ITEM_REMAINS_GYORG,              GI_REMAINS_GYORG,            GID_REMAINS_GYORG),
     RI(RI_REMAINS_ODOLWA,             "",     "Odolwa's Remains",           ITEM_REMAINS_ODOLWA,             GI_REMAINS_ODOLWA,           GID_REMAINS_ODOLWA),
     RI(RI_REMAINS_TWINMOLD,           "",     "Twinmold's Remains",         ITEM_REMAINS_TWINMOLD,           GI_REMAINS_TWINMOLD,         GID_REMAINS_TWINMOLD),
-    RI(RI_ROMANI_RANCH_MAP,           "the",  "Map of Romani Ranch",        ITEM_TINGLE_MAP,                 GI_TINGLE_MAP_ROMANI_RANCH,  GID_TINGLE_MAP),
     RI(RI_ROOM_KEY,                   "the",  "Room Key",                   ITEM_ROOM_KEY,                   GI_ROOM_KEY,                 GID_ROOM_KEY),
     RI(RI_RUPEE_BLUE,                 "a",    "Blue Rupee",                 ITEM_RUPEE_BLUE,                 GI_RUPEE_BLUE,               GID_RUPEE_BLUE),
     RI(RI_RUPEE_GREEN,                "a",    "Green Rupee",                ITEM_RUPEE_GREEN,                GI_RUPEE_GREEN,              GID_RUPEE_GREEN),
@@ -123,10 +120,9 @@ std::map<RandoItemId, RandoStaticItem> Items = {
     RI(RI_SINGLE_MAGIC,               "the",  "Power of Magic",             ITEM_NONE,                       GI_NONE,                     GID_MAGIC_JAR_SMALL),
     RI(RI_SNOWHEAD_BOSS_KEY,          "the",  "Snowhead Boss Key",          ITEM_KEY_BOSS,                   GI_KEY_BOSS,                 GID_KEY_BOSS),
     RI(RI_SNOWHEAD_COMPASS,           "the",  "Snowhead Compass",           ITEM_COMPASS,                    GI_COMPASS,                  GID_COMPASS),
-    RI(RI_SNOWHEAD_MAP,               "the",  "Map of Snowhead",            ITEM_TINGLE_MAP,                 GI_TINGLE_MAP_SNOWHEAD,      GID_TINGLE_MAP),
+    RI(RI_SNOWHEAD_MAP,               "the",  "Snowhead Map",               ITEM_DUNGEON_MAP,                GI_MAP,                      GID_DUNGEON_MAP),
     RI(RI_SNOWHEAD_SMALL_KEY,         "a",    "Snowhead Small Key",         ITEM_KEY_SMALL,                  GI_KEY_SMALL,                GID_KEY_SMALL),
     RI(RI_SNOWHEAD_STRAY_FAIRY,       "a",    "Snowhead Stray Fairy",       ITEM_STRAY_FAIRIES,              GI_STRAY_FAIRY,              GID_NONE),
-    RI(RI_SNOWHEAD_TEMPLE_MAP,        "the",  "Snowhead Temple Map",        ITEM_DUNGEON_MAP,                GI_MAP,                      GID_DUNGEON_MAP),
     RI(RI_SONG_ELEGY,                 "the",  "Elegy of Emptiness",         ITEM_SONG_ELEGY,                 GI_NONE,                     GID_NONE),
     RI(RI_SONG_EPONA,                 "",     "Epona's Song",               ITEM_SONG_EPONA,                 GI_NONE,                     GID_NONE),
     RI(RI_SONG_HEALING,               "the",  "Song of Healing",            ITEM_SONG_HEALING,               GI_NONE,                     GID_NONE),
@@ -139,21 +135,25 @@ std::map<RandoItemId, RandoStaticItem> Items = {
     RI(RI_SONG_TIME,                  "the",  "Song of Time",               ITEM_SONG_TIME,                  GI_NONE,                     GID_NONE),
     RI(RI_STONE_TOWER_BOSS_KEY,       "the",  "Stone Tower Boss Key",       ITEM_KEY_BOSS,                   GI_KEY_BOSS,                 GID_KEY_BOSS),
     RI(RI_STONE_TOWER_COMPASS,        "the",  "Stone Tower Compass",        ITEM_COMPASS,                    GI_COMPASS,                  GID_COMPASS),
-    RI(RI_STONE_TOWER_MAP,            "the",  "Map of Stone Tower",         ITEM_TINGLE_MAP,                 GI_TINGLE_MAP_STONE_TOWER,   GID_TINGLE_MAP),
+    RI(RI_STONE_TOWER_MAP,            "the",  "Stone Tower Map",            ITEM_DUNGEON_MAP,                GI_MAP,                      GID_DUNGEON_MAP),
     RI(RI_STONE_TOWER_SMALL_KEY,      "a",    "Stone Tower Small Key",      ITEM_KEY_SMALL,                  GI_KEY_SMALL,                GID_KEY_SMALL),
     RI(RI_STONE_TOWER_STRAY_FAIRY,    "a",    "Stone Tower Stray Fairy",    ITEM_STRAY_FAIRIES,              GI_STRAY_FAIRY,              GID_NONE),
-    RI(RI_STONE_TOWER_TEMPLE_MAP,     "the",  "Stone Tower Temple Map",     ITEM_DUNGEON_MAP,                GI_MAP,                      GID_DUNGEON_MAP),
     RI(RI_SWORD_GILDED,               "the",  "Gilded Sword",               ITEM_SWORD_GILDED,               GI_SWORD_GILDED,             GID_SWORD_GILDED),
     RI(RI_SWORD_KOKIRI,               "the",  "Kokiri Sword",               ITEM_SWORD_KOKIRI,               GI_SWORD_KOKIRI,             GID_SWORD_KOKIRI),
     RI(RI_SWORD_RAZOR,                "the",  "Razor Sword",                ITEM_SWORD_RAZOR,                GI_SWORD_RAZOR,              GID_SWORD_RAZOR),
+    RI(RI_TINGLE_MAP_CLOCK_TOWN,      "the",  "Map of Clock Town",          ITEM_TINGLE_MAP,                 GI_TINGLE_MAP_CLOCK_TOWN,    GID_TINGLE_MAP),
+    RI(RI_TINGLE_MAP_GREAT_BAY,       "the",  "Map of Great Bay",           ITEM_TINGLE_MAP,                 GI_TINGLE_MAP_GREAT_BAY,     GID_TINGLE_MAP),
+    RI(RI_TINGLE_MAP_ROMANI_RANCH,    "",     "Tingle's Romani Ranch Map",  ITEM_TINGLE_MAP,                 GI_TINGLE_MAP_ROMANI_RANCH,  GID_TINGLE_MAP),
+    RI(RI_TINGLE_MAP_SNOWHEAD,        "",     "Tingle's Snowhead Map",      ITEM_TINGLE_MAP,                 GI_TINGLE_MAP_SNOWHEAD,      GID_TINGLE_MAP),
+    RI(RI_TINGLE_MAP_STONE_TOWER,     "",     "Tingle's Stone Tower Map",   ITEM_TINGLE_MAP,                 GI_TINGLE_MAP_STONE_TOWER,   GID_TINGLE_MAP),
+    RI(RI_TINGLE_MAP_WOODFALL,        "",     "Tingle's Woodfall Map",      ITEM_TINGLE_MAP,                 GI_TINGLE_MAP_WOODFALL,      GID_TINGLE_MAP),
     RI(RI_WALLET_ADULT,               "the",  "Adult's Wallet",             ITEM_WALLET_ADULT,               GI_WALLET_ADULT,             GID_WALLET_ADULT),
     RI(RI_WALLET_GIANT,               "the",  "Giant's Wallet",             ITEM_WALLET_GIANT,               GI_WALLET_GIANT,             GID_WALLET_GIANT),
     RI(RI_WOODFALL_BOSS_KEY,          "the",  "Woodfall Boss Key",          ITEM_KEY_BOSS,                   GI_KEY_BOSS,                 GID_KEY_BOSS),
     RI(RI_WOODFALL_COMPASS,           "the",  "Woodfall Compass",           ITEM_COMPASS,                    GI_COMPASS,                  GID_COMPASS),
-    RI(RI_WOODFALL_MAP,               "the",  "Map of Woodfall",            ITEM_TINGLE_MAP,                 GI_TINGLE_MAP_WOODFALL,      GID_TINGLE_MAP),
+    RI(RI_WOODFALL_MAP,               "the",  "Woodfall Map",               ITEM_DUNGEON_MAP,                GI_MAP,                      GID_DUNGEON_MAP),
     RI(RI_WOODFALL_SMALL_KEY,         "a",    "Woodfall Small Key",         ITEM_KEY_SMALL,                  GI_KEY_SMALL,                GID_KEY_SMALL),
     RI(RI_WOODFALL_STRAY_FAIRY,       "a",    "Woodfall Stray Fairy",       ITEM_STRAY_FAIRIES,              GI_STRAY_FAIRY,              GID_NONE),
-    RI(RI_WOODFALL_TEMPLE_MAP,        "the",  "Woodfall Temple Map",        ITEM_DUNGEON_MAP,                GI_MAP,                      GID_DUNGEON_MAP),
 };
 
 RandoItemId GetItemIdFromName(const char* name) {
diff --git a/mm/2s2h/Rando/Types.h b/mm/2s2h/Rando/Types.h
index 90fd4f090..ce5c9228e 100644
--- a/mm/2s2h/Rando/Types.h
+++ b/mm/2s2h/Rando/Types.h
@@ -906,7 +906,6 @@ typedef enum {
     RI_BOMBS_5,
     RI_BOTTLE_EMPTY,
     RI_BOW,
-    RI_CLOCK_TOWN_MAP,
     RI_CLOCK_TOWN_STRAY_FAIRY,
     RI_DEED_LAND,
     RI_DEED_MOUNTAIN,
@@ -924,7 +923,6 @@ typedef enum {
     RI_GREAT_BAY_MAP,
     RI_GREAT_BAY_SMALL_KEY,
     RI_GREAT_BAY_STRAY_FAIRY,
-    RI_GREAT_BAY_TEMPLE_MAP,
     RI_GREAT_FAIRY_SWORD,
     RI_GREAT_SPIN_ATTACK,
     RI_GREEN_POTION_REFILL,
@@ -985,7 +983,6 @@ typedef enum {
     RI_REMAINS_GYORG,
     RI_REMAINS_ODOLWA,
     RI_REMAINS_TWINMOLD,
-    RI_ROMANI_RANCH_MAP,
     RI_ROOM_KEY,
     RI_RUPEE_BLUE,
     RI_RUPEE_GREEN,
@@ -1001,7 +998,6 @@ typedef enum {
     RI_SNOWHEAD_MAP,
     RI_SNOWHEAD_SMALL_KEY,
     RI_SNOWHEAD_STRAY_FAIRY,
-    RI_SNOWHEAD_TEMPLE_MAP,
     RI_SONG_ELEGY,
     RI_SONG_EPONA,
     RI_SONG_HEALING,
@@ -1020,10 +1016,15 @@ typedef enum {
     RI_STONE_TOWER_MAP,
     RI_STONE_TOWER_SMALL_KEY,
     RI_STONE_TOWER_STRAY_FAIRY,
-    RI_STONE_TOWER_TEMPLE_MAP,
     RI_SWORD_GILDED,
     RI_SWORD_KOKIRI,
     RI_SWORD_RAZOR,
+    RI_TINGLE_MAP_CLOCK_TOWN,
+    RI_TINGLE_MAP_GREAT_BAY,
+    RI_TINGLE_MAP_ROMANI_RANCH,
+    RI_TINGLE_MAP_SNOWHEAD,
+    RI_TINGLE_MAP_STONE_TOWER,
+    RI_TINGLE_MAP_WOODFALL,
     RI_WALLET_ADULT,
     RI_WALLET_GIANT,
     RI_WOODFALL_BOSS_KEY,
@@ -1031,7 +1032,6 @@ typedef enum {
     RI_WOODFALL_MAP,
     RI_WOODFALL_SMALL_KEY,
     RI_WOODFALL_STRAY_FAIRY,
-    RI_WOODFALL_TEMPLE_MAP,
     RI_MAX,
 } RandoItemId;
 
diff --git a/mm/src/overlays/actors/ovl_En_Bal/z_en_bal.c b/mm/src/overlays/actors/ovl_En_Bal/z_en_bal.c
index b1620b45d..92347a746 100644
--- a/mm/src/overlays/actors/ovl_En_Bal/z_en_bal.c
+++ b/mm/src/overlays/actors/ovl_En_Bal/z_en_bal.c
@@ -835,7 +835,8 @@ void EnBal_TryPurchaseMap(EnBal* this, PlayState* play) {
                 Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, TINGLE_ANIM_TALK);
                 Message_StartTextbox(play, 0x1D0A, &this->picto.actor);
                 this->textId = 0x1D0A;
-            } else if ((GameInteractor_Should(VB_ALREADY_HAVE_TINGLE_MAP, EnBal_CheckIfMapUnlocked(this, play), this, &price))) {
+            } else if ((GameInteractor_Should(VB_ALREADY_HAVE_TINGLE_MAP, EnBal_CheckIfMapUnlocked(this, play), this,
+                                              &price))) {
                 // Can't buy map because player already has it
                 Audio_PlaySfx(NA_SE_SY_ERROR);
                 Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, TINGLE_ANIM_TALK);