diff options
| author | ultima-soul <akshayjhanji@hotmail.com> | 2020-03-13 00:32:04 -0700 |
|---|---|---|
| committer | ultima-soul <akshayjhanji@hotmail.com> | 2020-03-13 00:32:04 -0700 |
| commit | 99e4de062ae43aa978ad4f1a8cd70bc739c64c9d (patch) | |
| tree | 1164d31577e6ebddc1cb313d40bb69ce0d426170 /data/maps/map_groups.json | |
| parent | 339c2914affc3c62ac9a5725aa1a0c7ccc3161ca (diff) | |
| parent | 6af8c04d8fa6aaeaeb6c8b919e7770a65b9a883d (diff) | |
Merge branch 'master' into event_object_movement
Diffstat (limited to 'data/maps/map_groups.json')
| -rw-r--r-- | data/maps/map_groups.json | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index 05f1cd544..a7a468351 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -178,17 +178,17 @@ ], "gMapGroup2": [ "NavelRock_Exterior", - "SevenIsland_TrainerTower_1F", - "SevenIsland_TrainerTower_2F", - "SevenIsland_TrainerTower_3F", - "SevenIsland_TrainerTower_4F", - "SevenIsland_TrainerTower_5F", - "SevenIsland_TrainerTower_6F", - "SevenIsland_TrainerTower_7F", - "SevenIsland_TrainerTower_8F", - "SevenIsland_TrainerTower_Roof", - "SevenIsland_TrainerTower_Lobby", - "SevenIsland_TrainerTower_Elevator", + "TrainerTower_1F", + "TrainerTower_2F", + "TrainerTower_3F", + "TrainerTower_4F", + "TrainerTower_5F", + "TrainerTower_6F", + "TrainerTower_7F", + "TrainerTower_8F", + "TrainerTower_Roof", + "TrainerTower_Lobby", + "TrainerTower_Elevator", "FiveIsland_LostCave_Entrance", "FiveIsland_LostCave_Room1", "FiveIsland_LostCave_Room2", @@ -250,7 +250,7 @@ "CinnabarIsland", "IndigoPlateau_Exterior", "SaffronCity", - "SaffronCity_Classic", + "SaffronCity_Connection", "OneIsland", "TwoIsland", "ThreeIsland", @@ -289,10 +289,10 @@ "TwoIsland_CapeBrink", "ThreeIsland_BondBridge", "ThreeIsland_Port", - "UnknownMap_03_50", - "UnknownMap_03_51", - "UnknownMap_03_52", - "UnknownMap_03_53", + "Prototype_SeviiIsle_6", + "Prototype_SeviiIsle_7", + "Prototype_SeviiIsle_8", + "Prototype_SeviiIsle_9", "FiveIsland_ResortGorgeous", "FiveIsland_WaterLabyrinth", "FiveIsland_Meadow", @@ -409,15 +409,15 @@ "IndigoPlateau_PokemonCenter_2F" ], "gMapGroup14": [ - "SaffronCity_House1_1F", - "SaffronCity_House1_2F", + "SaffronCity_CopycatsHouse_1F", + "SaffronCity_CopycatsHouse_2F", "SaffronCity_Dojo", "SaffronCity_Gym", - "SaffronCity_House2", + "SaffronCity_House", "SaffronCity_Mart", "SaffronCity_PokemonCenter_1F", "SaffronCity_PokemonCenter_2F", - "SaffronCity_House3", + "SaffronCity_MrPsychicsHouse", "SaffronCity_PokemonTrainerFanClub" ], "gMapGroup15": [ @@ -567,7 +567,7 @@ "CinnabarIsland", "IndigoPlateau_Exterior", "SaffronCity", - "SaffronCity_Classic", + "SaffronCity_Connection", "OneIsland", "TwoIsland", "ThreeIsland", @@ -605,8 +605,8 @@ "TwoIsland_CapeBrink", "ThreeIsland_BondBridge", "ThreeIsland_Port", - "UnknownMap_03_50", - "UnknownMap_03_51", + "Prototype_SeviiIsle_6", + "Prototype_SeviiIsle_7", "FiveIsland_ResortGorgeous", "FiveIsland_WaterLabyrinth", "FiveIsland_Meadow", |