diff options
Diffstat (limited to 'data')
-rw-r--r-- | data/event_scripts.s | 8 | ||||
-rw-r--r-- | data/field_effect_scripts.s | 52 | ||||
-rw-r--r-- | data/maps/Route19_UnusedHouse/map.json (renamed from data/maps/UnusedHouse_27_00/map.json) | 4 | ||||
-rw-r--r-- | data/maps/Route19_UnusedHouse/scripts.inc | 2 | ||||
-rw-r--r-- | data/maps/Route23_UnusedHouse/map.json (renamed from data/maps/UnusedHouse_29_00/map.json) | 4 | ||||
-rw-r--r-- | data/maps/Route23_UnusedHouse/scripts.inc | 2 | ||||
-rw-r--r-- | data/maps/Route6_UnusedHouse/map.json (renamed from data/maps/UnknownMap_18_01/map.json) | 4 | ||||
-rw-r--r-- | data/maps/Route6_UnusedHouse/scripts.inc | 2 | ||||
-rw-r--r-- | data/maps/SevenIsland_UnusedHouse/map.json (renamed from data/maps/UnusedHouse_31_05/map.json) | 4 | ||||
-rw-r--r-- | data/maps/SevenIsland_UnusedHouse/scripts.inc | 2 | ||||
-rw-r--r-- | data/maps/UnknownMap_18_01/scripts.inc | 2 | ||||
-rw-r--r-- | data/maps/UnusedHouse_27_00/scripts.inc | 2 | ||||
-rw-r--r-- | data/maps/UnusedHouse_29_00/scripts.inc | 2 | ||||
-rw-r--r-- | data/maps/UnusedHouse_31_05/scripts.inc | 2 | ||||
-rw-r--r-- | data/maps/map_groups.json | 182 |
15 files changed, 137 insertions, 137 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index cbc607230..d1f46fef1 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -440,7 +440,7 @@ gStdScriptsEnd:: .include "data/maps/Route5_PokemonDayCare/scripts.inc" .include "data/maps/Route5_SouthEntrance/scripts.inc" .include "data/maps/Route6_NorthEntrance/scripts.inc" - .include "data/maps/UnknownMap_18_01/scripts.inc" + .include "data/maps/Route6_UnusedHouse/scripts.inc" .include "data/maps/Route7_EastEntrance/scripts.inc" .include "data/maps/Route8_WestEntrance/scripts.inc" .include "data/maps/Route10_PokemonCenter_1F/scripts.inc" @@ -457,16 +457,16 @@ gStdScriptsEnd:: .include "data/maps/Route16_NorthEntrance_2F/scripts.inc" .include "data/maps/Route18_EastEntrance_1F/scripts.inc" .include "data/maps/Route18_EastEntrance_2F/scripts.inc" - .include "data/maps/UnusedHouse_27_00/scripts.inc" + .include "data/maps/Route19_UnusedHouse/scripts.inc" .include "data/maps/Route22_NorthEntrance/scripts.inc" - .include "data/maps/UnusedHouse_29_00/scripts.inc" + .include "data/maps/Route23_UnusedHouse/scripts.inc" .include "data/maps/Route25_SeaCottage/scripts.inc" .include "data/maps/SevenIsland_House_Room1/scripts.inc" .include "data/maps/SevenIsland_House_Room2/scripts.inc" .include "data/maps/SevenIsland_Mart/scripts.inc" .include "data/maps/SevenIsland_PokemonCenter_1F/scripts.inc" .include "data/maps/SevenIsland_PokemonCenter_2F/scripts.inc" - .include "data/maps/UnusedHouse_31_05/scripts.inc" + .include "data/maps/SevenIsland_UnusedHouse/scripts.inc" .include "data/maps/SevenIsland_Harbor/scripts.inc" .include "data/maps/OneIsland_PokemonCenter_1F/scripts.inc" .include "data/maps/OneIsland_PokemonCenter_2F/scripts.inc" diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 43698653d..98201382c 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -90,11 +90,11 @@ gFldEffScript_Shadow:: @ 81D97D6 end gFldEffScript_TallGrass:: @ 81D97DC - loadfadedpal_callnative gUnknown_83A5348, FldEff_TallGrass + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_TallGrass end gFldEffScript_Ripple:: @ 81D97E6 - loadfadedpal_callnative gUnknown_83A5348, FldEff_Ripple + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_Ripple end gFldEffScript_FieldMoveShowMon:: @ 81D97F0 @@ -102,7 +102,7 @@ gFldEffScript_FieldMoveShowMon:: @ 81D97F0 end gFldEffScript_Ash:: @ 81D97F6 - loadfadedpal_callnative gUnknown_83A5348, FldEff_Ash + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_Ash end gFldEffScript_SurfBlob:: @ 81D9800 @@ -114,54 +114,54 @@ gFldEffScript_UseSurf:: @ 81D9806 end gFldEffScript_Dust:: @ 81D980C - loadfadedpal_callnative gUnknown_83A5340, FldEff_Dust + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_Dust end gFldEffScript_UseSecretPowerCave:: @ 81D9816 end gFldEffScript_JumpTallGrass:: @ 81D9817 - loadfadedpal_callnative gUnknown_83A5348, FldEff_JumpTallGrass + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_JumpTallGrass end gFldEffScript_SandFootprints:: @ 81D9821 - loadfadedpal_callnative gUnknown_83A5340, FldEff_SandFootprints + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_SandFootprints end gFldEffScript_JumpBigSplash:: @ 81D982B - loadfadedpal_callnative gUnknown_83A5340, FldEff_JumpBigSplash + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_JumpBigSplash end gFldEffScript_Splash:: @ 81D9835 - loadfadedpal_callnative gUnknown_83A5340, FldEff_Splash + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_Splash end gFldEffScript_JumpSmallSplash:: @ 81D983F - loadfadedpal_callnative gUnknown_83A5340, FldEff_JumpSmallSplash + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_JumpSmallSplash end gFldEffScript_LongGrass:: @ 81D9849 - loadfadedpal_callnative gUnknown_83A5348, FldEff_LongGrass + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_LongGrass end gFldEffScript_JumpLongGrass:: @ 81D9853 - loadfadedpal_callnative gUnknown_83A5348, FldEff_JumpLongGrass + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_JumpLongGrass end gFldEffScript_Unknown19:: @ 81D985D - loadfadedpal_callnative gUnknown_83A5348, FldEff_Unknown19 + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_Unknown19 end gFldEffScript_Unknown20:: @ 81D9867 - loadfadedpal_callnative gUnknown_83A5348, FldEff_Unknown20 + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_Unknown20 end gFldEffScript_Unknown21:: @ 81D9871 - loadfadedpal_callnative gUnknown_83A5340, FldEff_Unknown21 + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_Unknown21 end gFldEffScript_Unknown22:: @ 81D987B - loadfadedpal_callnative gUnknown_83A5340, FldEff_Unknown22 + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_Unknown22 end gFldEffScript_BerryTreeGrowthSparkle:: @ 81D9885 @@ -169,12 +169,12 @@ gFldEffScript_BerryTreeGrowthSparkle:: @ 81D9885 end gFldEffScript_DeepSandFootprints:: @ 81D988B - loadfadedpal_callnative gUnknown_83A5340, FldEff_DeepSandFootprints + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_DeepSandFootprints end gFldEffScript_PokecenterHeal:: @ 81D9895 loadfadedpal gUnknown_83CBE9C - loadfadedpal_callnative gUnknown_83A5340, FldEff_PokecenterHeal + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_PokecenterHeal end gFldEffScript_UseSecretPowerTree:: @ 81D98A4 @@ -208,11 +208,11 @@ gFldEffScript_QuestionMarkIcon:: @ 81D98C4 end gFldEffScript_FeetInFlowingWater:: @ 81D98CA - loadfadedpal_callnative gUnknown_83A5340, FldEff_FeetInFlowingWater + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_FeetInFlowingWater end gFldEffScript_BikeTireTracks:: @ 81D98D4 - loadfadedpal_callnative gUnknown_83A5340, FldEff_BikeTireTracks + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_BikeTireTracks end gFldEffScript_SandDisguise:: @ 81D98DE @@ -232,15 +232,15 @@ gFldEffScript_UseDig:: @ 81D98F0 end gFldEffScript_SandPile:: @ 81D98F6 - loadfadedpal_callnative gUnknown_83A5340, FldEff_SandPile + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_SandPile end gFldEffScript_ShortGrass:: @ 81D9900 - loadfadedpal_callnative gUnknown_83A5348, FldEff_ShortGrass + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_ShortGrass end gFldEffScript_HotSpringsWater:: @ 81D990A - loadfadedpal_callnative gUnknown_83A5348, FldEff_HotSpringsWater + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_HotSpringsWater end gFldEffScript_UseWaterfall:: @ 81D9914 @@ -267,11 +267,11 @@ gFldEffScript_Nop48:: @ 81D9932 end gFldEffScript_PopOutOfAsh:: @ 81D9933 - loadfadedpal_callnative gUnknown_83A5ED8, FldEff_PopOutOfAsh + loadfadedpal_callnative gSpritePalette_Ash, FldEff_PopOutOfAsh end gFldEffScript_LavaridgeGymWarp:: @ 81D993D - loadfadedpal_callnative gUnknown_83A5ED8, FldEff_LavaridgeGymWarp + loadfadedpal_callnative gSpritePalette_Ash, FldEff_LavaridgeGymWarp end gFldEffScript_SweetScent:: @ 81D9947 @@ -282,11 +282,11 @@ gFldEffScript_SandPillar:: @ 81D994D end gFldEffScript_Bubbles:: @ 81D994E - loadfadedpal_callnative gUnknown_83A5340, FldEff_Bubbles + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_Bubbles end gFldEffScript_Sparkle:: @ 81D9958 - loadfadedpal_callnative gUnknown_83A5FF8, FldEff_Sparkle + loadfadedpal_callnative gSpritePalette_SmallSparkle, FldEff_Sparkle end gFldEffScript_SecretPowerCave:: @ 81D9962 diff --git a/data/maps/UnusedHouse_27_00/map.json b/data/maps/Route19_UnusedHouse/map.json index 0d5b626e3..33a86a9b8 100644 --- a/data/maps/UnusedHouse_27_00/map.json +++ b/data/maps/Route19_UnusedHouse/map.json @@ -1,6 +1,6 @@ { - "id": "MAP_UNUSED_HOUSE_27_00", - "name": "UnusedHouse_27_00", + "id": "MAP_ROUTE19_UNUSED_HOUSE", + "name": "Route19_UnusedHouse", "layout": "LAYOUT_HOUSE2", "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_19", diff --git a/data/maps/Route19_UnusedHouse/scripts.inc b/data/maps/Route19_UnusedHouse/scripts.inc new file mode 100644 index 000000000..5f807660c --- /dev/null +++ b/data/maps/Route19_UnusedHouse/scripts.inc @@ -0,0 +1,2 @@ +Route19_UnusedHouse_MapScripts:: @ 81704FA + .byte 0 diff --git a/data/maps/UnusedHouse_29_00/map.json b/data/maps/Route23_UnusedHouse/map.json index f5563c4cb..c8f7f260c 100644 --- a/data/maps/UnusedHouse_29_00/map.json +++ b/data/maps/Route23_UnusedHouse/map.json @@ -1,6 +1,6 @@ { - "id": "MAP_UNUSED_HOUSE_29_00", - "name": "UnusedHouse_29_00", + "id": "MAP_ROUTE23_UNUSED_HOUSE", + "name": "Route23_UnusedHouse", "layout": "LAYOUT_HOUSE2", "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_ROUTE_23", diff --git a/data/maps/Route23_UnusedHouse/scripts.inc b/data/maps/Route23_UnusedHouse/scripts.inc new file mode 100644 index 000000000..276915e12 --- /dev/null +++ b/data/maps/Route23_UnusedHouse/scripts.inc @@ -0,0 +1,2 @@ +Route23_UnusedHouse_MapScripts:: @ 8170522 + .byte 0 diff --git a/data/maps/UnknownMap_18_01/map.json b/data/maps/Route6_UnusedHouse/map.json index 603f2bc97..6db713c52 100644 --- a/data/maps/UnknownMap_18_01/map.json +++ b/data/maps/Route6_UnusedHouse/map.json @@ -1,6 +1,6 @@ { - "id": "MAP_UNKNOWN_MAP_18_01", - "name": "UnknownMap_18_01", + "id": "MAP_ROUTE6_UNUSED_HOUSE", + "name": "Route6_UnusedHouse", "layout": "LAYOUT_HOUSE2", "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_6", diff --git a/data/maps/Route6_UnusedHouse/scripts.inc b/data/maps/Route6_UnusedHouse/scripts.inc new file mode 100644 index 000000000..365de06a3 --- /dev/null +++ b/data/maps/Route6_UnusedHouse/scripts.inc @@ -0,0 +1,2 @@ +Route6_UnusedHouse_MapScripts:: @ 816FA8C + .byte 0 diff --git a/data/maps/UnusedHouse_31_05/map.json b/data/maps/SevenIsland_UnusedHouse/map.json index 9e850ee52..d9f8f1666 100644 --- a/data/maps/UnusedHouse_31_05/map.json +++ b/data/maps/SevenIsland_UnusedHouse/map.json @@ -1,6 +1,6 @@ { - "id": "MAP_UNUSED_HOUSE_31_05", - "name": "UnusedHouse_31_05", + "id": "MAP_SEVEN_ISLAND_UNUSED_HOUSE", + "name": "SevenIsland_UnusedHouse", "layout": "LAYOUT_HOUSE4", "music": "MUS_SEVII_67", "region_map_section": "MAPSEC_SEVEN_ISLAND", diff --git a/data/maps/SevenIsland_UnusedHouse/scripts.inc b/data/maps/SevenIsland_UnusedHouse/scripts.inc new file mode 100644 index 000000000..d6014463c --- /dev/null +++ b/data/maps/SevenIsland_UnusedHouse/scripts.inc @@ -0,0 +1,2 @@ +SevenIsland_UnusedHouse_MapScripts:: @ 8170BE3 + .byte 0 diff --git a/data/maps/UnknownMap_18_01/scripts.inc b/data/maps/UnknownMap_18_01/scripts.inc deleted file mode 100644 index 15459c3a9..000000000 --- a/data/maps/UnknownMap_18_01/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnknownMap_18_01_MapScripts:: @ 816FA8C - .byte 0 diff --git a/data/maps/UnusedHouse_27_00/scripts.inc b/data/maps/UnusedHouse_27_00/scripts.inc deleted file mode 100644 index 973665fa1..000000000 --- a/data/maps/UnusedHouse_27_00/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnusedHouse_27_00_MapScripts:: @ 81704FA - .byte 0 diff --git a/data/maps/UnusedHouse_29_00/scripts.inc b/data/maps/UnusedHouse_29_00/scripts.inc deleted file mode 100644 index d0a4cc1a8..000000000 --- a/data/maps/UnusedHouse_29_00/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnusedHouse_29_00_MapScripts:: @ 8170522 - .byte 0 diff --git a/data/maps/UnusedHouse_31_05/scripts.inc b/data/maps/UnusedHouse_31_05/scripts.inc deleted file mode 100644 index ee5cfa2cb..000000000 --- a/data/maps/UnusedHouse_31_05/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnusedHouse_31_05_MapScripts:: @ 8170BE3 - .byte 0 diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index a468baa37..ad423a9db 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -1,57 +1,57 @@ { "group_order": [ - "gMapGroup0", - "gMapGroup1", - "gMapGroup2", - "gMapGroup3", - "gMapGroup4", - "gMapGroup5", - "gMapGroup6", - "gMapGroup7", - "gMapGroup8", - "gMapGroup9", - "gMapGroup10", - "gMapGroup11", - "gMapGroup12", - "gMapGroup13", - "gMapGroup14", - "gMapGroup15", - "gMapGroup16", - "gMapGroup17", - "gMapGroup18", - "gMapGroup19", - "gMapGroup20", - "gMapGroup21", - "gMapGroup22", - "gMapGroup23", - "gMapGroup24", - "gMapGroup25", - "gMapGroup26", - "gMapGroup27", - "gMapGroup28", - "gMapGroup29", - "gMapGroup30", - "gMapGroup31", - "gMapGroup32", - "gMapGroup33", - "gMapGroup34", - "gMapGroup35", - "gMapGroup36", - "gMapGroup37", - "gMapGroup38", - "gMapGroup39", - "gMapGroup40", - "gMapGroup41", - "gMapGroup42" - ], - "gMapGroup0": [ + "gMapGroup_Link", + "gMapGroup_Dungeons", + "gMapGroup_SpecialArea", + "gMapGroup_TownsAndRoutes", + "gMapGroup_IndoorPallet", + "gMapGroup_IndoorViridian", + "gMapGroup_IndoorPewter", + "gMapGroup_IndoorCerulean", + "gMapGroup_IndoorLavender", + "gMapGroup_IndoorVermilion", + "gMapGroup_IndoorCeladon", + "gMapGroup_IndoorFuchsia", + "gMapGroup_IndoorCinnabar", + "gMapGroup_IndoorIndigoPlateau", + "gMapGroup_IndoorSaffron", + "gMapGroup_IndoorRoute2", + "gMapGroup_IndoorRoute4", + "gMapGroup_IndoorRoute5", + "gMapGroup_IndoorRoute6", + "gMapGroup_IndoorRoute7", + "gMapGroup_IndoorRoute8", + "gMapGroup_IndoorRoute10", + "gMapGroup_IndoorRoute11", + "gMapGroup_IndoorRoute12", + "gMapGroup_IndoorRoute15", + "gMapGroup_IndoorRoute16", + "gMapGroup_IndoorRoute18", + "gMapGroup_IndoorRoute19", + "gMapGroup_IndoorRoute22", + "gMapGroup_IndoorRoute23", + "gMapGroup_IndoorRoute25", + "gMapGroup_IndoorSevenIsland", + "gMapGroup_IndoorOneIsland", + "gMapGroup_IndoorTwoIsland", + "gMapGroup_IndoorThreeIsland", + "gMapGroup_IndoorFourIsland", + "gMapGroup_IndoorFiveIsland", + "gMapGroup_IndoorSixIsland", + "gMapGroup_IndoorThreeIslandRoute", + "gMapGroup_IndoorFiveIslandRoute", + "gMapGroup_IndoorTwoIslandRoute", + "gMapGroup_IndoorSixIslandRoute", + "gMapGroup_IndoorSevenIslandRoute" + ], + "gMapGroup_Link": [ "BattleColosseum_2P", "TradeCenter", "RecordCorner", "BattleColosseum_4P", "UnionRoom" ], - "gMapGroup1": [ + "gMapGroup_Dungeons": [ "ViridianForest", "MtMoon_1F", "MtMoon_B1F", @@ -176,7 +176,7 @@ "SixIsland_PatternBush", "SixIsland_AlteringCave" ], - "gMapGroup2": [ + "gMapGroup_SpecialArea": [ "NavelRock_Exterior", "TrainerTower_1F", "TrainerTower_2F", @@ -238,7 +238,7 @@ "BirthIsland_Harbor", "NavelRock_Harbor" ], - "gMapGroup3": [ + "gMapGroup_TownsAndRoutes": [ "PalletTown", "ViridianCity", "PewterCity", @@ -306,13 +306,13 @@ "SevenIsland_SevaultCanyon", "SevenIsland_TanobyRuins" ], - "gMapGroup4": [ + "gMapGroup_IndoorPallet": [ "PalletTown_PlayersHouse_1F", "PalletTown_PlayersHouse_2F", "PalletTown_RivalsHouse", "PalletTown_ProfessorOaksLab" ], - "gMapGroup5": [ + "gMapGroup_IndoorViridian": [ "ViridianCity_House1", "ViridianCity_Gym", "ViridianCity_House2", @@ -320,7 +320,7 @@ "ViridianCity_PokemonCenter_1F", "ViridianCity_PokemonCenter_2F" ], - "gMapGroup6": [ + "gMapGroup_IndoorPewter": [ "PewterCity_Museum_1F", "PewterCity_Museum_2F", "PewterCity_Gym", @@ -330,7 +330,7 @@ "PewterCity_PokemonCenter_2F", "PewterCity_House2" ], - "gMapGroup7": [ + "gMapGroup_IndoorCerulean": [ "CeruleanCity_House1", "CeruleanCity_House2", "CeruleanCity_House3", @@ -342,7 +342,7 @@ "CeruleanCity_House4", "CeruleanCity_House5" ], - "gMapGroup8": [ + "gMapGroup_IndoorLavender": [ "LavenderTown_PokemonCenter_1F", "LavenderTown_PokemonCenter_2F", "LavenderTown_VolunteerPokemonHouse", @@ -350,7 +350,7 @@ "LavenderTown_House2", "LavenderTown_Mart" ], - "gMapGroup9": [ + "gMapGroup_IndoorVermilion": [ "VermilionCity_House1", "VermilionCity_PokemonCenter_1F", "VermilionCity_PokemonCenter_2F", @@ -360,7 +360,7 @@ "VermilionCity_Gym", "VermilionCity_House3" ], - "gMapGroup10": [ + "gMapGroup_IndoorCeladon": [ "CeladonCity_DepartmentStore_1F", "CeladonCity_DepartmentStore_2F", "CeladonCity_DepartmentStore_3F", @@ -382,7 +382,7 @@ "CeladonCity_House1", "CeladonCity_Hotel" ], - "gMapGroup11": [ + "gMapGroup_IndoorFuchsia": [ "FuchsiaCity_SafariZone_Entrance", "FuchsiaCity_Mart", "FuchsiaCity_SafariZone_Office", @@ -394,7 +394,7 @@ "FuchsiaCity_House2", "FuchsiaCity_House3" ], - "gMapGroup12": [ + "gMapGroup_IndoorCinnabar": [ "CinnabarIsland_Gym", "CinnabarIsland_PokemonLab_Entrance", "CinnabarIsland_PokemonLab_Lounge", @@ -404,11 +404,11 @@ "CinnabarIsland_PokemonCenter_2F", "CinnabarIsland_Mart" ], - "gMapGroup13": [ + "gMapGroup_IndoorIndigoPlateau": [ "IndigoPlateau_PokemonCenter_1F", "IndigoPlateau_PokemonCenter_2F" ], - "gMapGroup14": [ + "gMapGroup_IndoorSaffron": [ "SaffronCity_CopycatsHouse_1F", "SaffronCity_CopycatsHouse_2F", "SaffronCity_Dojo", @@ -420,92 +420,92 @@ "SaffronCity_MrPsychicsHouse", "SaffronCity_PokemonTrainerFanClub" ], - "gMapGroup15": [ + "gMapGroup_IndoorRoute2": [ "Route2_ViridianForest_SouthEntrance", "Route2_House", "Route2_EastBuilding", "Route2_ViridianForest_NorthEntrance" ], - "gMapGroup16": [ + "gMapGroup_IndoorRoute4": [ "Route4_PokemonCenter_1F", "Route4_PokemonCenter_2F" ], - "gMapGroup17": [ + "gMapGroup_IndoorRoute5": [ "Route5_PokemonDayCare", "Route5_SouthEntrance" ], - "gMapGroup18": [ + "gMapGroup_IndoorRoute6": [ "Route6_NorthEntrance", - "UnknownMap_18_01" + "Route6_UnusedHouse" ], - "gMapGroup19": [ + "gMapGroup_IndoorRoute7": [ "Route7_EastEntrance" ], - "gMapGroup20": [ + "gMapGroup_IndoorRoute8": [ "Route8_WestEntrance" ], - "gMapGroup21": [ + "gMapGroup_IndoorRoute10": [ "Route10_PokemonCenter_1F", "Route10_PokemonCenter_2F" ], - "gMapGroup22": [ + "gMapGroup_IndoorRoute11": [ "Route11_EastEntrance_1F", "Route11_EastEntrance_2F" ], - "gMapGroup23": [ + "gMapGroup_IndoorRoute12": [ "Route12_NorthEntrance_1F", "Route12_NorthEntrance_2F", "Route12_FishingHouse" ], - "gMapGroup24": [ + "gMapGroup_IndoorRoute15": [ "Route15_WestEntrance_1F", "Route15_WestEntrance_2F" ], - "gMapGroup25": [ + "gMapGroup_IndoorRoute16": [ "Route16_House", "Route16_NorthEntrance_1F", "Route16_NorthEntrance_2F" ], - "gMapGroup26": [ + "gMapGroup_IndoorRoute18": [ "Route18_EastEntrance_1F", "Route18_EastEntrance_2F" ], - "gMapGroup27": [ - "UnusedHouse_27_00" + "gMapGroup_IndoorRoute19": [ + "Route19_UnusedHouse" ], - "gMapGroup28": [ + "gMapGroup_IndoorRoute22": [ "Route22_NorthEntrance" ], - "gMapGroup29": [ - "UnusedHouse_29_00" + "gMapGroup_IndoorRoute23": [ + "Route23_UnusedHouse" ], - "gMapGroup30": [ + "gMapGroup_IndoorRoute25": [ "Route25_SeaCottage" ], - "gMapGroup31": [ + "gMapGroup_IndoorSevenIsland": [ "SevenIsland_House_Room1", "SevenIsland_House_Room2", "SevenIsland_Mart", "SevenIsland_PokemonCenter_1F", "SevenIsland_PokemonCenter_2F", - "UnusedHouse_31_05", + "SevenIsland_UnusedHouse", "SevenIsland_Harbor" ], - "gMapGroup32": [ + "gMapGroup_IndoorOneIsland": [ "OneIsland_PokemonCenter_1F", "OneIsland_PokemonCenter_2F", "OneIsland_House1", "OneIsland_House2", "OneIsland_Harbor" ], - "gMapGroup33": [ + "gMapGroup_IndoorTwoIsland": [ "TwoIsland_JoyfulGameCorner", "TwoIsland_House", "TwoIsland_PokemonCenter_1F", "TwoIsland_PokemonCenter_2F", "TwoIsland_Harbor" ], - "gMapGroup34": [ + "gMapGroup_IndoorThreeIsland": [ "ThreeIsland_House1", "ThreeIsland_PokemonCenter_1F", "ThreeIsland_PokemonCenter_2F", @@ -515,7 +515,7 @@ "ThreeIsland_House4", "ThreeIsland_House5" ], - "gMapGroup35": [ + "gMapGroup_IndoorFourIsland": [ "FourIsland_PokemonDayCare", "FourIsland_PokemonCenter_1F", "FourIsland_PokemonCenter_2F", @@ -525,34 +525,34 @@ "FourIsland_House2", "FourIsland_Mart" ], - "gMapGroup36": [ + "gMapGroup_IndoorFiveIsland": [ "FiveIsland_PokemonCenter_1F", "FiveIsland_PokemonCenter_2F", "FiveIsland_Harbor", "FiveIsland_House1", "FiveIsland_House2" ], - "gMapGroup37": [ + "gMapGroup_IndoorSixIsland": [ "SixIsland_PokemonCenter_1F", "SixIsland_PokemonCenter_2F", "SixIsland_Harbor", "SixIsland_House", "SixIsland_Mart" ], - "gMapGroup38": [ + "gMapGroup_IndoorThreeIslandRoute": [ "ThreeIsland_Harbor" ], - "gMapGroup39": [ + "gMapGroup_IndoorFiveIslandRoute": [ "FiveIsland_ResortGorgeous_House" ], - "gMapGroup40": [ + "gMapGroup_IndoorTwoIslandRoute": [ "TwoIsland_CapeBrink_House" ], - "gMapGroup41": [ + "gMapGroup_IndoorSixIslandRoute": [ "SixIsland_WaterPath_House1", "SixIsland_WaterPath_House2" ], - "gMapGroup42": [ + "gMapGroup_IndoorSevenIslandRoute": [ "SevenIsland_SevaultCanyon_House" ], "connections_include_order": [ |