dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #427 from GriffinRichards/name-mapgroups

Browse Source 
Name map groups
This commit is contained in:
PikalaxALT
2021-05-13 14:24:11 -04:00
committed by GitHub
parent 0ccdd940f7 7deccc36b7
commit 3dce3407d5
16 changed files with 162 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/event_scripts.s
+4 -4
View File
@@ -440,7 +440,7 @@ gStdScriptsEnd::
.include "data/maps/Route5_PokemonDayCare/scripts.inc" .include "data/maps/Route5_PokemonDayCare/scripts.inc"
.include "data/maps/Route5_SouthEntrance/scripts.inc" .include "data/maps/Route5_SouthEntrance/scripts.inc"
.include "data/maps/Route6_NorthEntrance/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/Route7_EastEntrance/scripts.inc"
.include "data/maps/Route8_WestEntrance/scripts.inc" .include "data/maps/Route8_WestEntrance/scripts.inc"
.include "data/maps/Route10_PokemonCenter_1F/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/Route16_NorthEntrance_2F/scripts.inc"
.include "data/maps/Route18_EastEntrance_1F/scripts.inc" .include "data/maps/Route18_EastEntrance_1F/scripts.inc"
.include "data/maps/Route18_EastEntrance_2F/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/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/Route25_SeaCottage/scripts.inc"
.include "data/maps/SevenIsland_House_Room1/scripts.inc" .include "data/maps/SevenIsland_House_Room1/scripts.inc"
.include "data/maps/SevenIsland_House_Room2/scripts.inc" .include "data/maps/SevenIsland_House_Room2/scripts.inc"
.include "data/maps/SevenIsland_Mart/scripts.inc" .include "data/maps/SevenIsland_Mart/scripts.inc"
.include "data/maps/SevenIsland_PokemonCenter_1F/scripts.inc" .include "data/maps/SevenIsland_PokemonCenter_1F/scripts.inc"
.include "data/maps/SevenIsland_PokemonCenter_2F/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/SevenIsland_Harbor/scripts.inc"
.include "data/maps/OneIsland_PokemonCenter_1F/scripts.inc" .include "data/maps/OneIsland_PokemonCenter_1F/scripts.inc"
.include "data/maps/OneIsland_PokemonCenter_2F/scripts.inc" .include "data/maps/OneIsland_PokemonCenter_2F/scripts.inc"
data/maps/UnusedHouse_27_00/map.json → data/maps/Route19_UnusedHouse/map.json
+2 -2
View File
@@ -1,6 +1,6 @@
{ {
"id": "MAP_UNUSED_HOUSE_27_00", "id": "MAP_ROUTE19_UNUSED_HOUSE",
"name": "UnusedHouse_27_00", "name": "Route19_UnusedHouse",
"layout": "LAYOUT_HOUSE2", "layout": "LAYOUT_HOUSE2",
"music": "MUS_ROUTE3", "music": "MUS_ROUTE3",
"region_map_section": "MAPSEC_ROUTE_19", "region_map_section": "MAPSEC_ROUTE_19",
data/maps/Route19_UnusedHouse/scripts.inc
+2
View File
@@ -0,0 +1,2 @@
Route19_UnusedHouse_MapScripts:: @ 81704FA
.byte 0
data/maps/UnusedHouse_29_00/map.json → data/maps/Route23_UnusedHouse/map.json
+2 -2
View File
@@ -1,6 +1,6 @@
{ {
"id": "MAP_UNUSED_HOUSE_29_00", "id": "MAP_ROUTE23_UNUSED_HOUSE",
"name": "UnusedHouse_29_00", "name": "Route23_UnusedHouse",
"layout": "LAYOUT_HOUSE2", "layout": "LAYOUT_HOUSE2",
"music": "MUS_VICTORY_ROAD", "music": "MUS_VICTORY_ROAD",
"region_map_section": "MAPSEC_ROUTE_23", "region_map_section": "MAPSEC_ROUTE_23",
data/maps/Route23_UnusedHouse/scripts.inc
+2
View File
@@ -0,0 +1,2 @@
Route23_UnusedHouse_MapScripts:: @ 8170522
.byte 0
data/maps/UnknownMap_18_01/map.json → data/maps/Route6_UnusedHouse/map.json
+2 -2
View File
@@ -1,6 +1,6 @@
{ {
"id": "MAP_UNKNOWN_MAP_18_01", "id": "MAP_ROUTE6_UNUSED_HOUSE",
"name": "UnknownMap_18_01", "name": "Route6_UnusedHouse",
"layout": "LAYOUT_HOUSE2", "layout": "LAYOUT_HOUSE2",
"music": "MUS_ROUTE3", "music": "MUS_ROUTE3",
"region_map_section": "MAPSEC_ROUTE_6", "region_map_section": "MAPSEC_ROUTE_6",
data/maps/Route6_UnusedHouse/scripts.inc
+2
View File
@@ -0,0 +1,2 @@
Route6_UnusedHouse_MapScripts:: @ 816FA8C
.byte 0
data/maps/UnusedHouse_31_05/map.json → data/maps/SevenIsland_UnusedHouse/map.json
+2 -2
View File
@@ -1,6 +1,6 @@
{ {
"id": "MAP_UNUSED_HOUSE_31_05", "id": "MAP_SEVEN_ISLAND_UNUSED_HOUSE",
"name": "UnusedHouse_31_05", "name": "SevenIsland_UnusedHouse",
"layout": "LAYOUT_HOUSE4", "layout": "LAYOUT_HOUSE4",
"music": "MUS_SEVII_67", "music": "MUS_SEVII_67",
"region_map_section": "MAPSEC_SEVEN_ISLAND", "region_map_section": "MAPSEC_SEVEN_ISLAND",
data/maps/SevenIsland_UnusedHouse/scripts.inc
+2
View File
@@ -0,0 +1,2 @@
SevenIsland_UnusedHouse_MapScripts:: @ 8170BE3
.byte 0
data/maps/UnknownMap_18_01/scripts.inc
-2
View File
@@ -1,2 +0,0 @@
UnknownMap_18_01_MapScripts:: @ 816FA8C
.byte 0
data/maps/UnusedHouse_27_00/scripts.inc
-2
View File
@@ -1,2 +0,0 @@
UnusedHouse_27_00_MapScripts:: @ 81704FA
.byte 0
data/maps/UnusedHouse_29_00/scripts.inc
-2
View File
@@ -1,2 +0,0 @@
UnusedHouse_29_00_MapScripts:: @ 8170522
.byte 0
data/maps/UnusedHouse_31_05/scripts.inc
-2
View File
@@ -1,2 +0,0 @@
UnusedHouse_31_05_MapScripts:: @ 8170BE3
.byte 0
data/maps/map_groups.json
+90 -90
View File
@@ -1,57 +1,57 @@
{ {
"group_order": [ "group_order": [
"gMapGroup0", "gMapGroup_Link",
"gMapGroup1", "gMapGroup_Dungeons",
"gMapGroup2", "gMapGroup_SpecialArea",
"gMapGroup3", "gMapGroup_TownsAndRoutes",
"gMapGroup4", "gMapGroup_IndoorPallet",
"gMapGroup5", "gMapGroup_IndoorViridian",
"gMapGroup6", "gMapGroup_IndoorPewter",
"gMapGroup7", "gMapGroup_IndoorCerulean",
"gMapGroup8", "gMapGroup_IndoorLavender",
"gMapGroup9", "gMapGroup_IndoorVermilion",
"gMapGroup10", "gMapGroup_IndoorCeladon",
"gMapGroup11", "gMapGroup_IndoorFuchsia",
"gMapGroup12", "gMapGroup_IndoorCinnabar",
"gMapGroup13", "gMapGroup_IndoorIndigoPlateau",
"gMapGroup14", "gMapGroup_IndoorSaffron",
"gMapGroup15", "gMapGroup_IndoorRoute2",
"gMapGroup16", "gMapGroup_IndoorRoute4",
"gMapGroup17", "gMapGroup_IndoorRoute5",
"gMapGroup18", "gMapGroup_IndoorRoute6",
"gMapGroup19", "gMapGroup_IndoorRoute7",
"gMapGroup20", "gMapGroup_IndoorRoute8",
"gMapGroup21", "gMapGroup_IndoorRoute10",
"gMapGroup22", "gMapGroup_IndoorRoute11",
"gMapGroup23", "gMapGroup_IndoorRoute12",
"gMapGroup24", "gMapGroup_IndoorRoute15",
"gMapGroup25", "gMapGroup_IndoorRoute16",
"gMapGroup26", "gMapGroup_IndoorRoute18",
"gMapGroup27", "gMapGroup_IndoorRoute19",
"gMapGroup28", "gMapGroup_IndoorRoute22",
"gMapGroup29", "gMapGroup_IndoorRoute23",
"gMapGroup30", "gMapGroup_IndoorRoute25",
"gMapGroup31", "gMapGroup_IndoorSevenIsland",
"gMapGroup32", "gMapGroup_IndoorOneIsland",
"gMapGroup33", "gMapGroup_IndoorTwoIsland",
"gMapGroup34", "gMapGroup_IndoorThreeIsland",
"gMapGroup35", "gMapGroup_IndoorFourIsland",
"gMapGroup36", "gMapGroup_IndoorFiveIsland",
"gMapGroup37", "gMapGroup_IndoorSixIsland",
"gMapGroup38", "gMapGroup_IndoorThreeIslandRoute",
"gMapGroup39", "gMapGroup_IndoorFiveIslandRoute",
"gMapGroup40", "gMapGroup_IndoorTwoIslandRoute",
"gMapGroup41", "gMapGroup_IndoorSixIslandRoute",
"gMapGroup42" "gMapGroup_IndoorSevenIslandRoute"
], ],
"gMapGroup0": [ "gMapGroup_Link": [
"BattleColosseum_2P", "BattleColosseum_2P",
"TradeCenter", "TradeCenter",
"RecordCorner", "RecordCorner",
"BattleColosseum_4P", "BattleColosseum_4P",
"UnionRoom" "UnionRoom"
], ],
"gMapGroup1": [ "gMapGroup_Dungeons": [
"ViridianForest", "ViridianForest",
"MtMoon_1F", "MtMoon_1F",
"MtMoon_B1F", "MtMoon_B1F",
@@ -176,7 +176,7 @@
"SixIsland_PatternBush", "SixIsland_PatternBush",
"SixIsland_AlteringCave" "SixIsland_AlteringCave"
], ],
"gMapGroup2": [ "gMapGroup_SpecialArea": [
"NavelRock_Exterior", "NavelRock_Exterior",
"TrainerTower_1F", "TrainerTower_1F",
"TrainerTower_2F", "TrainerTower_2F",
@@ -238,7 +238,7 @@
"BirthIsland_Harbor", "BirthIsland_Harbor",
"NavelRock_Harbor" "NavelRock_Harbor"
], ],
"gMapGroup3": [ "gMapGroup_TownsAndRoutes": [
"PalletTown", "PalletTown",
"ViridianCity", "ViridianCity",
"PewterCity", "PewterCity",
@@ -306,13 +306,13 @@
"SevenIsland_SevaultCanyon", "SevenIsland_SevaultCanyon",
"SevenIsland_TanobyRuins" "SevenIsland_TanobyRuins"
], ],
"gMapGroup4": [ "gMapGroup_IndoorPallet": [
"PalletTown_PlayersHouse_1F", "PalletTown_PlayersHouse_1F",
"PalletTown_PlayersHouse_2F", "PalletTown_PlayersHouse_2F",
"PalletTown_RivalsHouse", "PalletTown_RivalsHouse",
"PalletTown_ProfessorOaksLab" "PalletTown_ProfessorOaksLab"
], ],
"gMapGroup5": [ "gMapGroup_IndoorViridian": [
"ViridianCity_House1", "ViridianCity_House1",
"ViridianCity_Gym", "ViridianCity_Gym",
"ViridianCity_House2", "ViridianCity_House2",
@@ -320,7 +320,7 @@
"ViridianCity_PokemonCenter_1F", "ViridianCity_PokemonCenter_1F",
"ViridianCity_PokemonCenter_2F" "ViridianCity_PokemonCenter_2F"
], ],
"gMapGroup6": [ "gMapGroup_IndoorPewter": [
"PewterCity_Museum_1F", "PewterCity_Museum_1F",
"PewterCity_Museum_2F", "PewterCity_Museum_2F",
"PewterCity_Gym", "PewterCity_Gym",
@@ -330,7 +330,7 @@
"PewterCity_PokemonCenter_2F", "PewterCity_PokemonCenter_2F",
"PewterCity_House2" "PewterCity_House2"
], ],
"gMapGroup7": [ "gMapGroup_IndoorCerulean": [
"CeruleanCity_House1", "CeruleanCity_House1",
"CeruleanCity_House2", "CeruleanCity_House2",
"CeruleanCity_House3", "CeruleanCity_House3",
@@ -342,7 +342,7 @@
"CeruleanCity_House4", "CeruleanCity_House4",
"CeruleanCity_House5" "CeruleanCity_House5"
], ],
"gMapGroup8": [ "gMapGroup_IndoorLavender": [
"LavenderTown_PokemonCenter_1F", "LavenderTown_PokemonCenter_1F",
"LavenderTown_PokemonCenter_2F", "LavenderTown_PokemonCenter_2F",
"LavenderTown_VolunteerPokemonHouse", "LavenderTown_VolunteerPokemonHouse",
@@ -350,7 +350,7 @@
"LavenderTown_House2", "LavenderTown_House2",
"LavenderTown_Mart" "LavenderTown_Mart"
], ],
"gMapGroup9": [ "gMapGroup_IndoorVermilion": [
"VermilionCity_House1", "VermilionCity_House1",
"VermilionCity_PokemonCenter_1F", "VermilionCity_PokemonCenter_1F",
"VermilionCity_PokemonCenter_2F", "VermilionCity_PokemonCenter_2F",
@@ -360,7 +360,7 @@
"VermilionCity_Gym", "VermilionCity_Gym",
"VermilionCity_House3" "VermilionCity_House3"
], ],
"gMapGroup10": [ "gMapGroup_IndoorCeladon": [
"CeladonCity_DepartmentStore_1F", "CeladonCity_DepartmentStore_1F",
"CeladonCity_DepartmentStore_2F", "CeladonCity_DepartmentStore_2F",
"CeladonCity_DepartmentStore_3F", "CeladonCity_DepartmentStore_3F",
@@ -382,7 +382,7 @@
"CeladonCity_House1", "CeladonCity_House1",
"CeladonCity_Hotel" "CeladonCity_Hotel"
], ],
"gMapGroup11": [ "gMapGroup_IndoorFuchsia": [
"FuchsiaCity_SafariZone_Entrance", "FuchsiaCity_SafariZone_Entrance",
"FuchsiaCity_Mart", "FuchsiaCity_Mart",
"FuchsiaCity_SafariZone_Office", "FuchsiaCity_SafariZone_Office",
@@ -394,7 +394,7 @@
"FuchsiaCity_House2", "FuchsiaCity_House2",
"FuchsiaCity_House3" "FuchsiaCity_House3"
], ],
"gMapGroup12": [ "gMapGroup_IndoorCinnabar": [
"CinnabarIsland_Gym", "CinnabarIsland_Gym",
"CinnabarIsland_PokemonLab_Entrance", "CinnabarIsland_PokemonLab_Entrance",
"CinnabarIsland_PokemonLab_Lounge", "CinnabarIsland_PokemonLab_Lounge",
@@ -404,11 +404,11 @@
"CinnabarIsland_PokemonCenter_2F", "CinnabarIsland_PokemonCenter_2F",
"CinnabarIsland_Mart" "CinnabarIsland_Mart"
], ],
"gMapGroup13": [ "gMapGroup_IndoorIndigoPlateau": [
"IndigoPlateau_PokemonCenter_1F", "IndigoPlateau_PokemonCenter_1F",
"IndigoPlateau_PokemonCenter_2F" "IndigoPlateau_PokemonCenter_2F"
], ],
"gMapGroup14": [ "gMapGroup_IndoorSaffron": [
"SaffronCity_CopycatsHouse_1F", "SaffronCity_CopycatsHouse_1F",
"SaffronCity_CopycatsHouse_2F", "SaffronCity_CopycatsHouse_2F",
"SaffronCity_Dojo", "SaffronCity_Dojo",
@@ -420,92 +420,92 @@
"SaffronCity_MrPsychicsHouse", "SaffronCity_MrPsychicsHouse",
"SaffronCity_PokemonTrainerFanClub" "SaffronCity_PokemonTrainerFanClub"
], ],
"gMapGroup15": [ "gMapGroup_IndoorRoute2": [
"Route2_ViridianForest_SouthEntrance", "Route2_ViridianForest_SouthEntrance",
"Route2_House", "Route2_House",
"Route2_EastBuilding", "Route2_EastBuilding",
"Route2_ViridianForest_NorthEntrance" "Route2_ViridianForest_NorthEntrance"
], ],
"gMapGroup16": [ "gMapGroup_IndoorRoute4": [
"Route4_PokemonCenter_1F", "Route4_PokemonCenter_1F",
"Route4_PokemonCenter_2F" "Route4_PokemonCenter_2F"
], ],
"gMapGroup17": [ "gMapGroup_IndoorRoute5": [
"Route5_PokemonDayCare", "Route5_PokemonDayCare",
"Route5_SouthEntrance" "Route5_SouthEntrance"
], ],
"gMapGroup18": [ "gMapGroup_IndoorRoute6": [
"Route6_NorthEntrance", "Route6_NorthEntrance",
"UnknownMap_18_01" "Route6_UnusedHouse"
], ],
"gMapGroup19": [ "gMapGroup_IndoorRoute7": [
"Route7_EastEntrance" "Route7_EastEntrance"
], ],
"gMapGroup20": [ "gMapGroup_IndoorRoute8": [
"Route8_WestEntrance" "Route8_WestEntrance"
], ],
"gMapGroup21": [ "gMapGroup_IndoorRoute10": [
"Route10_PokemonCenter_1F", "Route10_PokemonCenter_1F",
"Route10_PokemonCenter_2F" "Route10_PokemonCenter_2F"
], ],
"gMapGroup22": [ "gMapGroup_IndoorRoute11": [
"Route11_EastEntrance_1F", "Route11_EastEntrance_1F",
"Route11_EastEntrance_2F" "Route11_EastEntrance_2F"
], ],
"gMapGroup23": [ "gMapGroup_IndoorRoute12": [
"Route12_NorthEntrance_1F", "Route12_NorthEntrance_1F",
"Route12_NorthEntrance_2F", "Route12_NorthEntrance_2F",
"Route12_FishingHouse" "Route12_FishingHouse"
], ],
"gMapGroup24": [ "gMapGroup_IndoorRoute15": [
"Route15_WestEntrance_1F", "Route15_WestEntrance_1F",
"Route15_WestEntrance_2F" "Route15_WestEntrance_2F"
], ],
"gMapGroup25": [ "gMapGroup_IndoorRoute16": [
"Route16_House", "Route16_House",
"Route16_NorthEntrance_1F", "Route16_NorthEntrance_1F",
"Route16_NorthEntrance_2F" "Route16_NorthEntrance_2F"
], ],
"gMapGroup26": [ "gMapGroup_IndoorRoute18": [
"Route18_EastEntrance_1F", "Route18_EastEntrance_1F",
"Route18_EastEntrance_2F" "Route18_EastEntrance_2F"
], ],
"gMapGroup27": [ "gMapGroup_IndoorRoute19": [
"UnusedHouse_27_00" "Route19_UnusedHouse"
], ],
"gMapGroup28": [ "gMapGroup_IndoorRoute22": [
"Route22_NorthEntrance" "Route22_NorthEntrance"
], ],
"gMapGroup29": [ "gMapGroup_IndoorRoute23": [
"UnusedHouse_29_00" "Route23_UnusedHouse"
], ],
"gMapGroup30": [ "gMapGroup_IndoorRoute25": [
"Route25_SeaCottage" "Route25_SeaCottage"
], ],
"gMapGroup31": [ "gMapGroup_IndoorSevenIsland": [
"SevenIsland_House_Room1", "SevenIsland_House_Room1",
"SevenIsland_House_Room2", "SevenIsland_House_Room2",
"SevenIsland_Mart", "SevenIsland_Mart",
"SevenIsland_PokemonCenter_1F", "SevenIsland_PokemonCenter_1F",
"SevenIsland_PokemonCenter_2F", "SevenIsland_PokemonCenter_2F",
"UnusedHouse_31_05", "SevenIsland_UnusedHouse",
"SevenIsland_Harbor" "SevenIsland_Harbor"
], ],
"gMapGroup32": [ "gMapGroup_IndoorOneIsland": [
"OneIsland_PokemonCenter_1F", "OneIsland_PokemonCenter_1F",
"OneIsland_PokemonCenter_2F", "OneIsland_PokemonCenter_2F",
"OneIsland_House1", "OneIsland_House1",
"OneIsland_House2", "OneIsland_House2",
"OneIsland_Harbor" "OneIsland_Harbor"
], ],
"gMapGroup33": [ "gMapGroup_IndoorTwoIsland": [
"TwoIsland_JoyfulGameCorner", "TwoIsland_JoyfulGameCorner",
"TwoIsland_House", "TwoIsland_House",
"TwoIsland_PokemonCenter_1F", "TwoIsland_PokemonCenter_1F",
"TwoIsland_PokemonCenter_2F", "TwoIsland_PokemonCenter_2F",
"TwoIsland_Harbor" "TwoIsland_Harbor"
], ],
"gMapGroup34": [ "gMapGroup_IndoorThreeIsland": [
"ThreeIsland_House1", "ThreeIsland_House1",
"ThreeIsland_PokemonCenter_1F", "ThreeIsland_PokemonCenter_1F",
"ThreeIsland_PokemonCenter_2F", "ThreeIsland_PokemonCenter_2F",
@@ -515,7 +515,7 @@
"ThreeIsland_House4", "ThreeIsland_House4",
"ThreeIsland_House5" "ThreeIsland_House5"
], ],
"gMapGroup35": [ "gMapGroup_IndoorFourIsland": [
"FourIsland_PokemonDayCare", "FourIsland_PokemonDayCare",
"FourIsland_PokemonCenter_1F", "FourIsland_PokemonCenter_1F",
"FourIsland_PokemonCenter_2F", "FourIsland_PokemonCenter_2F",
@@ -525,34 +525,34 @@
"FourIsland_House2", "FourIsland_House2",
"FourIsland_Mart" "FourIsland_Mart"
], ],
"gMapGroup36": [ "gMapGroup_IndoorFiveIsland": [
"FiveIsland_PokemonCenter_1F", "FiveIsland_PokemonCenter_1F",
"FiveIsland_PokemonCenter_2F", "FiveIsland_PokemonCenter_2F",
"FiveIsland_Harbor", "FiveIsland_Harbor",
"FiveIsland_House1", "FiveIsland_House1",
"FiveIsland_House2" "FiveIsland_House2"
], ],
"gMapGroup37": [ "gMapGroup_IndoorSixIsland": [
"SixIsland_PokemonCenter_1F", "SixIsland_PokemonCenter_1F",
"SixIsland_PokemonCenter_2F", "SixIsland_PokemonCenter_2F",
"SixIsland_Harbor", "SixIsland_Harbor",
"SixIsland_House", "SixIsland_House",
"SixIsland_Mart" "SixIsland_Mart"
], ],
"gMapGroup38": [ "gMapGroup_IndoorThreeIslandRoute": [
"ThreeIsland_Harbor" "ThreeIsland_Harbor"
], ],
"gMapGroup39": [ "gMapGroup_IndoorFiveIslandRoute": [
"FiveIsland_ResortGorgeous_House" "FiveIsland_ResortGorgeous_House"
], ],
"gMapGroup40": [ "gMapGroup_IndoorTwoIslandRoute": [
"TwoIsland_CapeBrink_House" "TwoIsland_CapeBrink_House"
], ],
"gMapGroup41": [ "gMapGroup_IndoorSixIslandRoute": [
"SixIsland_WaterPath_House1", "SixIsland_WaterPath_House1",
"SixIsland_WaterPath_House2" "SixIsland_WaterPath_House2"
], ],
"gMapGroup42": [ "gMapGroup_IndoorSevenIslandRoute": [
"SevenIsland_SevaultCanyon_House" "SevenIsland_SevaultCanyon_House"
], ],
"connections_include_order": [ "connections_include_order": [
include/constants/map_groups.h
+47 -47
View File
@@ -5,14 +5,14 @@
// DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/map_groups.json // DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/map_groups.json
// //
// Map Group 0 // gMapGroup_Link
#define MAP_BATTLE_COLOSSEUM_2P (0 | (0 << 8)) #define MAP_BATTLE_COLOSSEUM_2P (0 | (0 << 8))
#define MAP_TRADE_CENTER (1 | (0 << 8)) #define MAP_TRADE_CENTER (1 | (0 << 8))
#define MAP_RECORD_CORNER (2 | (0 << 8)) #define MAP_RECORD_CORNER (2 | (0 << 8))
#define MAP_BATTLE_COLOSSEUM_4P (3 | (0 << 8)) #define MAP_BATTLE_COLOSSEUM_4P (3 | (0 << 8))
#define MAP_UNION_ROOM (4 | (0 << 8)) #define MAP_UNION_ROOM (4 | (0 << 8))
// Map Group 1 // gMapGroup_Dungeons
#define MAP_VIRIDIAN_FOREST (0 | (1 << 8)) #define MAP_VIRIDIAN_FOREST (0 | (1 << 8))
#define MAP_MT_MOON_1F (1 | (1 << 8)) #define MAP_MT_MOON_1F (1 | (1 << 8))
#define MAP_MT_MOON_B1F (2 | (1 << 8)) #define MAP_MT_MOON_B1F (2 | (1 << 8))
@@ -137,7 +137,7 @@
#define MAP_SIX_ISLAND_PATTERN_BUSH (121 | (1 << 8)) #define MAP_SIX_ISLAND_PATTERN_BUSH (121 | (1 << 8))
#define MAP_SIX_ISLAND_ALTERING_CAVE (122 | (1 << 8)) #define MAP_SIX_ISLAND_ALTERING_CAVE (122 | (1 << 8))
// Map Group 2 // gMapGroup_SpecialArea
#define MAP_NAVEL_ROCK_EXTERIOR (0 | (2 << 8)) #define MAP_NAVEL_ROCK_EXTERIOR (0 | (2 << 8))
#define MAP_TRAINER_TOWER_1F (1 | (2 << 8)) #define MAP_TRAINER_TOWER_1F (1 | (2 << 8))
#define MAP_TRAINER_TOWER_2F (2 | (2 << 8)) #define MAP_TRAINER_TOWER_2F (2 | (2 << 8))
@@ -199,7 +199,7 @@
#define MAP_BIRTH_ISLAND_HARBOR (58 | (2 << 8)) #define MAP_BIRTH_ISLAND_HARBOR (58 | (2 << 8))
#define MAP_NAVEL_ROCK_HARBOR (59 | (2 << 8)) #define MAP_NAVEL_ROCK_HARBOR (59 | (2 << 8))
// Map Group 3 // gMapGroup_TownsAndRoutes
#define MAP_PALLET_TOWN (0 | (3 << 8)) #define MAP_PALLET_TOWN (0 | (3 << 8))
#define MAP_VIRIDIAN_CITY (1 | (3 << 8)) #define MAP_VIRIDIAN_CITY (1 | (3 << 8))
#define MAP_PEWTER_CITY (2 | (3 << 8)) #define MAP_PEWTER_CITY (2 | (3 << 8))
@@ -267,13 +267,13 @@
#define MAP_SEVEN_ISLAND_SEVAULT_CANYON (64 | (3 << 8)) #define MAP_SEVEN_ISLAND_SEVAULT_CANYON (64 | (3 << 8))
#define MAP_SEVEN_ISLAND_TANOBY_RUINS (65 | (3 << 8)) #define MAP_SEVEN_ISLAND_TANOBY_RUINS (65 | (3 << 8))
// Map Group 4 // gMapGroup_IndoorPallet
#define MAP_PALLET_TOWN_PLAYERS_HOUSE_1F (0 | (4 << 8)) #define MAP_PALLET_TOWN_PLAYERS_HOUSE_1F (0 | (4 << 8))
#define MAP_PALLET_TOWN_PLAYERS_HOUSE_2F (1 | (4 << 8)) #define MAP_PALLET_TOWN_PLAYERS_HOUSE_2F (1 | (4 << 8))
#define MAP_PALLET_TOWN_RIVALS_HOUSE (2 | (4 << 8)) #define MAP_PALLET_TOWN_RIVALS_HOUSE (2 | (4 << 8))
#define MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB (3 | (4 << 8)) #define MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB (3 | (4 << 8))
// Map Group 5 // gMapGroup_IndoorViridian
#define MAP_VIRIDIAN_CITY_HOUSE1 (0 | (5 << 8)) #define MAP_VIRIDIAN_CITY_HOUSE1 (0 | (5 << 8))
#define MAP_VIRIDIAN_CITY_GYM (1 | (5 << 8)) #define MAP_VIRIDIAN_CITY_GYM (1 | (5 << 8))
#define MAP_VIRIDIAN_CITY_HOUSE2 (2 | (5 << 8)) #define MAP_VIRIDIAN_CITY_HOUSE2 (2 | (5 << 8))
@@ -281,7 +281,7 @@
#define MAP_VIRIDIAN_CITY_POKEMON_CENTER_1F (4 | (5 << 8)) #define MAP_VIRIDIAN_CITY_POKEMON_CENTER_1F (4 | (5 << 8))
#define MAP_VIRIDIAN_CITY_POKEMON_CENTER_2F (5 | (5 << 8)) #define MAP_VIRIDIAN_CITY_POKEMON_CENTER_2F (5 | (5 << 8))
// Map Group 6 // gMapGroup_IndoorPewter
#define MAP_PEWTER_CITY_MUSEUM_1F (0 | (6 << 8)) #define MAP_PEWTER_CITY_MUSEUM_1F (0 | (6 << 8))
#define MAP_PEWTER_CITY_MUSEUM_2F (1 | (6 << 8)) #define MAP_PEWTER_CITY_MUSEUM_2F (1 | (6 << 8))
#define MAP_PEWTER_CITY_GYM (2 | (6 << 8)) #define MAP_PEWTER_CITY_GYM (2 | (6 << 8))
@@ -291,7 +291,7 @@
#define MAP_PEWTER_CITY_POKEMON_CENTER_2F (6 | (6 << 8)) #define MAP_PEWTER_CITY_POKEMON_CENTER_2F (6 | (6 << 8))
#define MAP_PEWTER_CITY_HOUSE2 (7 | (6 << 8)) #define MAP_PEWTER_CITY_HOUSE2 (7 | (6 << 8))
// Map Group 7 // gMapGroup_IndoorCerulean
#define MAP_CERULEAN_CITY_HOUSE1 (0 | (7 << 8)) #define MAP_CERULEAN_CITY_HOUSE1 (0 | (7 << 8))
#define MAP_CERULEAN_CITY_HOUSE2 (1 | (7 << 8)) #define MAP_CERULEAN_CITY_HOUSE2 (1 | (7 << 8))
#define MAP_CERULEAN_CITY_HOUSE3 (2 | (7 << 8)) #define MAP_CERULEAN_CITY_HOUSE3 (2 | (7 << 8))
@@ -303,7 +303,7 @@
#define MAP_CERULEAN_CITY_HOUSE4 (8 | (7 << 8)) #define MAP_CERULEAN_CITY_HOUSE4 (8 | (7 << 8))
#define MAP_CERULEAN_CITY_HOUSE5 (9 | (7 << 8)) #define MAP_CERULEAN_CITY_HOUSE5 (9 | (7 << 8))
// Map Group 8 // gMapGroup_IndoorLavender
#define MAP_LAVENDER_TOWN_POKEMON_CENTER_1F (0 | (8 << 8)) #define MAP_LAVENDER_TOWN_POKEMON_CENTER_1F (0 | (8 << 8))
#define MAP_LAVENDER_TOWN_POKEMON_CENTER_2F (1 | (8 << 8)) #define MAP_LAVENDER_TOWN_POKEMON_CENTER_2F (1 | (8 << 8))
#define MAP_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE (2 | (8 << 8)) #define MAP_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE (2 | (8 << 8))
@@ -311,7 +311,7 @@
#define MAP_LAVENDER_TOWN_HOUSE2 (4 | (8 << 8)) #define MAP_LAVENDER_TOWN_HOUSE2 (4 | (8 << 8))
#define MAP_LAVENDER_TOWN_MART (5 | (8 << 8)) #define MAP_LAVENDER_TOWN_MART (5 | (8 << 8))
// Map Group 9 // gMapGroup_IndoorVermilion
#define MAP_VERMILION_CITY_HOUSE1 (0 | (9 << 8)) #define MAP_VERMILION_CITY_HOUSE1 (0 | (9 << 8))
#define MAP_VERMILION_CITY_POKEMON_CENTER_1F (1 | (9 << 8)) #define MAP_VERMILION_CITY_POKEMON_CENTER_1F (1 | (9 << 8))
#define MAP_VERMILION_CITY_POKEMON_CENTER_2F (2 | (9 << 8)) #define MAP_VERMILION_CITY_POKEMON_CENTER_2F (2 | (9 << 8))
@@ -321,7 +321,7 @@
#define MAP_VERMILION_CITY_GYM (6 | (9 << 8)) #define MAP_VERMILION_CITY_GYM (6 | (9 << 8))
#define MAP_VERMILION_CITY_HOUSE3 (7 | (9 << 8)) #define MAP_VERMILION_CITY_HOUSE3 (7 | (9 << 8))
// Map Group 10 // gMapGroup_IndoorCeladon
#define MAP_CELADON_CITY_DEPARTMENT_STORE_1F (0 | (10 << 8)) #define MAP_CELADON_CITY_DEPARTMENT_STORE_1F (0 | (10 << 8))
#define MAP_CELADON_CITY_DEPARTMENT_STORE_2F (1 | (10 << 8)) #define MAP_CELADON_CITY_DEPARTMENT_STORE_2F (1 | (10 << 8))
#define MAP_CELADON_CITY_DEPARTMENT_STORE_3F (2 | (10 << 8)) #define MAP_CELADON_CITY_DEPARTMENT_STORE_3F (2 | (10 << 8))
@@ -343,7 +343,7 @@
#define MAP_CELADON_CITY_HOUSE1 (18 | (10 << 8)) #define MAP_CELADON_CITY_HOUSE1 (18 | (10 << 8))
#define MAP_CELADON_CITY_HOTEL (19 | (10 << 8)) #define MAP_CELADON_CITY_HOTEL (19 | (10 << 8))
// Map Group 11 // gMapGroup_IndoorFuchsia
#define MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE (0 | (11 << 8)) #define MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE (0 | (11 << 8))
#define MAP_FUCHSIA_CITY_MART (1 | (11 << 8)) #define MAP_FUCHSIA_CITY_MART (1 | (11 << 8))
#define MAP_FUCHSIA_CITY_SAFARI_ZONE_OFFICE (2 | (11 << 8)) #define MAP_FUCHSIA_CITY_SAFARI_ZONE_OFFICE (2 | (11 << 8))
@@ -355,7 +355,7 @@
#define MAP_FUCHSIA_CITY_HOUSE2 (8 | (11 << 8)) #define MAP_FUCHSIA_CITY_HOUSE2 (8 | (11 << 8))
#define MAP_FUCHSIA_CITY_HOUSE3 (9 | (11 << 8)) #define MAP_FUCHSIA_CITY_HOUSE3 (9 | (11 << 8))
// Map Group 12 // gMapGroup_IndoorCinnabar
#define MAP_CINNABAR_ISLAND_GYM (0 | (12 << 8)) #define MAP_CINNABAR_ISLAND_GYM (0 | (12 << 8))
#define MAP_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE (1 | (12 << 8)) #define MAP_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE (1 | (12 << 8))
#define MAP_CINNABAR_ISLAND_POKEMON_LAB_LOUNGE (2 | (12 << 8)) #define MAP_CINNABAR_ISLAND_POKEMON_LAB_LOUNGE (2 | (12 << 8))
@@ -365,11 +365,11 @@
#define MAP_CINNABAR_ISLAND_POKEMON_CENTER_2F (6 | (12 << 8)) #define MAP_CINNABAR_ISLAND_POKEMON_CENTER_2F (6 | (12 << 8))
#define MAP_CINNABAR_ISLAND_MART (7 | (12 << 8)) #define MAP_CINNABAR_ISLAND_MART (7 | (12 << 8))
// Map Group 13 // gMapGroup_IndoorIndigoPlateau
#define MAP_INDIGO_PLATEAU_POKEMON_CENTER_1F (0 | (13 << 8)) #define MAP_INDIGO_PLATEAU_POKEMON_CENTER_1F (0 | (13 << 8))
#define MAP_INDIGO_PLATEAU_POKEMON_CENTER_2F (1 | (13 << 8)) #define MAP_INDIGO_PLATEAU_POKEMON_CENTER_2F (1 | (13 << 8))
// Map Group 14 // gMapGroup_IndoorSaffron
#define MAP_SAFFRON_CITY_COPYCATS_HOUSE_1F (0 | (14 << 8)) #define MAP_SAFFRON_CITY_COPYCATS_HOUSE_1F (0 | (14 << 8))
#define MAP_SAFFRON_CITY_COPYCATS_HOUSE_2F (1 | (14 << 8)) #define MAP_SAFFRON_CITY_COPYCATS_HOUSE_2F (1 | (14 << 8))
#define MAP_SAFFRON_CITY_DOJO (2 | (14 << 8)) #define MAP_SAFFRON_CITY_DOJO (2 | (14 << 8))
@@ -381,92 +381,92 @@
#define MAP_SAFFRON_CITY_MR_PSYCHICS_HOUSE (8 | (14 << 8)) #define MAP_SAFFRON_CITY_MR_PSYCHICS_HOUSE (8 | (14 << 8))
#define MAP_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB (9 | (14 << 8)) #define MAP_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB (9 | (14 << 8))
// Map Group 15 // gMapGroup_IndoorRoute2
#define MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE (0 | (15 << 8)) #define MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE (0 | (15 << 8))
#define MAP_ROUTE2_HOUSE (1 | (15 << 8)) #define MAP_ROUTE2_HOUSE (1 | (15 << 8))
#define MAP_ROUTE2_EAST_BUILDING (2 | (15 << 8)) #define MAP_ROUTE2_EAST_BUILDING (2 | (15 << 8))
#define MAP_ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE (3 | (15 << 8)) #define MAP_ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE (3 | (15 << 8))
// Map Group 16 // gMapGroup_IndoorRoute4
#define MAP_ROUTE4_POKEMON_CENTER_1F (0 | (16 << 8)) #define MAP_ROUTE4_POKEMON_CENTER_1F (0 | (16 << 8))
#define MAP_ROUTE4_POKEMON_CENTER_2F (1 | (16 << 8)) #define MAP_ROUTE4_POKEMON_CENTER_2F (1 | (16 << 8))
// Map Group 17 // gMapGroup_IndoorRoute5
#define MAP_ROUTE5_POKEMON_DAY_CARE (0 | (17 << 8)) #define MAP_ROUTE5_POKEMON_DAY_CARE (0 | (17 << 8))
#define MAP_ROUTE5_SOUTH_ENTRANCE (1 | (17 << 8)) #define MAP_ROUTE5_SOUTH_ENTRANCE (1 | (17 << 8))
// Map Group 18 // gMapGroup_IndoorRoute6
#define MAP_ROUTE6_NORTH_ENTRANCE (0 | (18 << 8)) #define MAP_ROUTE6_NORTH_ENTRANCE (0 | (18 << 8))
#define MAP_UNKNOWN_MAP_18_01 (1 | (18 << 8)) #define MAP_ROUTE6_UNUSED_HOUSE (1 | (18 << 8))
// Map Group 19 // gMapGroup_IndoorRoute7
#define MAP_ROUTE7_EAST_ENTRANCE (0 | (19 << 8)) #define MAP_ROUTE7_EAST_ENTRANCE (0 | (19 << 8))
// Map Group 20 // gMapGroup_IndoorRoute8
#define MAP_ROUTE8_WEST_ENTRANCE (0 | (20 << 8)) #define MAP_ROUTE8_WEST_ENTRANCE (0 | (20 << 8))
// Map Group 21 // gMapGroup_IndoorRoute10
#define MAP_ROUTE10_POKEMON_CENTER_1F (0 | (21 << 8)) #define MAP_ROUTE10_POKEMON_CENTER_1F (0 | (21 << 8))
#define MAP_ROUTE10_POKEMON_CENTER_2F (1 | (21 << 8)) #define MAP_ROUTE10_POKEMON_CENTER_2F (1 | (21 << 8))
// Map Group 22 // gMapGroup_IndoorRoute11
#define MAP_ROUTE11_EAST_ENTRANCE_1F (0 | (22 << 8)) #define MAP_ROUTE11_EAST_ENTRANCE_1F (0 | (22 << 8))
#define MAP_ROUTE11_EAST_ENTRANCE_2F (1 | (22 << 8)) #define MAP_ROUTE11_EAST_ENTRANCE_2F (1 | (22 << 8))
// Map Group 23 // gMapGroup_IndoorRoute12
#define MAP_ROUTE12_NORTH_ENTRANCE_1F (0 | (23 << 8)) #define MAP_ROUTE12_NORTH_ENTRANCE_1F (0 | (23 << 8))
#define MAP_ROUTE12_NORTH_ENTRANCE_2F (1 | (23 << 8)) #define MAP_ROUTE12_NORTH_ENTRANCE_2F (1 | (23 << 8))
#define MAP_ROUTE12_FISHING_HOUSE (2 | (23 << 8)) #define MAP_ROUTE12_FISHING_HOUSE (2 | (23 << 8))
// Map Group 24 // gMapGroup_IndoorRoute15
#define MAP_ROUTE15_WEST_ENTRANCE_1F (0 | (24 << 8)) #define MAP_ROUTE15_WEST_ENTRANCE_1F (0 | (24 << 8))
#define MAP_ROUTE15_WEST_ENTRANCE_2F (1 | (24 << 8)) #define MAP_ROUTE15_WEST_ENTRANCE_2F (1 | (24 << 8))
// Map Group 25 // gMapGroup_IndoorRoute16
#define MAP_ROUTE16_HOUSE (0 | (25 << 8)) #define MAP_ROUTE16_HOUSE (0 | (25 << 8))
#define MAP_ROUTE16_NORTH_ENTRANCE_1F (1 | (25 << 8)) #define MAP_ROUTE16_NORTH_ENTRANCE_1F (1 | (25 << 8))
#define MAP_ROUTE16_NORTH_ENTRANCE_2F (2 | (25 << 8)) #define MAP_ROUTE16_NORTH_ENTRANCE_2F (2 | (25 << 8))
// Map Group 26 // gMapGroup_IndoorRoute18
#define MAP_ROUTE18_EAST_ENTRANCE_1F (0 | (26 << 8)) #define MAP_ROUTE18_EAST_ENTRANCE_1F (0 | (26 << 8))
#define MAP_ROUTE18_EAST_ENTRANCE_2F (1 | (26 << 8)) #define MAP_ROUTE18_EAST_ENTRANCE_2F (1 | (26 << 8))
// Map Group 27 // gMapGroup_IndoorRoute19
#define MAP_UNUSED_HOUSE_27_00 (0 | (27 << 8)) #define MAP_ROUTE19_UNUSED_HOUSE (0 | (27 << 8))
// Map Group 28 // gMapGroup_IndoorRoute22
#define MAP_ROUTE22_NORTH_ENTRANCE (0 | (28 << 8)) #define MAP_ROUTE22_NORTH_ENTRANCE (0 | (28 << 8))
// Map Group 29 // gMapGroup_IndoorRoute23
#define MAP_UNUSED_HOUSE_29_00 (0 | (29 << 8)) #define MAP_ROUTE23_UNUSED_HOUSE (0 | (29 << 8))
// Map Group 30 // gMapGroup_IndoorRoute25
#define MAP_ROUTE25_SEA_COTTAGE (0 | (30 << 8)) #define MAP_ROUTE25_SEA_COTTAGE (0 | (30 << 8))
// Map Group 31 // gMapGroup_IndoorSevenIsland
#define MAP_SEVEN_ISLAND_HOUSE_ROOM1 (0 | (31 << 8)) #define MAP_SEVEN_ISLAND_HOUSE_ROOM1 (0 | (31 << 8))
#define MAP_SEVEN_ISLAND_HOUSE_ROOM2 (1 | (31 << 8)) #define MAP_SEVEN_ISLAND_HOUSE_ROOM2 (1 | (31 << 8))
#define MAP_SEVEN_ISLAND_MART (2 | (31 << 8)) #define MAP_SEVEN_ISLAND_MART (2 | (31 << 8))
#define MAP_SEVEN_ISLAND_POKEMON_CENTER_1F (3 | (31 << 8)) #define MAP_SEVEN_ISLAND_POKEMON_CENTER_1F (3 | (31 << 8))
#define MAP_SEVEN_ISLAND_POKEMON_CENTER_2F (4 | (31 << 8)) #define MAP_SEVEN_ISLAND_POKEMON_CENTER_2F (4 | (31 << 8))
#define MAP_UNUSED_HOUSE_31_05 (5 | (31 << 8)) #define MAP_SEVEN_ISLAND_UNUSED_HOUSE (5 | (31 << 8))
#define MAP_SEVEN_ISLAND_HARBOR (6 | (31 << 8)) #define MAP_SEVEN_ISLAND_HARBOR (6 | (31 << 8))
// Map Group 32 // gMapGroup_IndoorOneIsland
#define MAP_ONE_ISLAND_POKEMON_CENTER_1F (0 | (32 << 8)) #define MAP_ONE_ISLAND_POKEMON_CENTER_1F (0 | (32 << 8))
#define MAP_ONE_ISLAND_POKEMON_CENTER_2F (1 | (32 << 8)) #define MAP_ONE_ISLAND_POKEMON_CENTER_2F (1 | (32 << 8))
#define MAP_ONE_ISLAND_HOUSE1 (2 | (32 << 8)) #define MAP_ONE_ISLAND_HOUSE1 (2 | (32 << 8))
#define MAP_ONE_ISLAND_HOUSE2 (3 | (32 << 8)) #define MAP_ONE_ISLAND_HOUSE2 (3 | (32 << 8))
#define MAP_ONE_ISLAND_HARBOR (4 | (32 << 8)) #define MAP_ONE_ISLAND_HARBOR (4 | (32 << 8))
// Map Group 33 // gMapGroup_IndoorTwoIsland
#define MAP_TWO_ISLAND_JOYFUL_GAME_CORNER (0 | (33 << 8)) #define MAP_TWO_ISLAND_JOYFUL_GAME_CORNER (0 | (33 << 8))
#define MAP_TWO_ISLAND_HOUSE (1 | (33 << 8)) #define MAP_TWO_ISLAND_HOUSE (1 | (33 << 8))
#define MAP_TWO_ISLAND_POKEMON_CENTER_1F (2 | (33 << 8)) #define MAP_TWO_ISLAND_POKEMON_CENTER_1F (2 | (33 << 8))
#define MAP_TWO_ISLAND_POKEMON_CENTER_2F (3 | (33 << 8)) #define MAP_TWO_ISLAND_POKEMON_CENTER_2F (3 | (33 << 8))
#define MAP_TWO_ISLAND_HARBOR (4 | (33 << 8)) #define MAP_TWO_ISLAND_HARBOR (4 | (33 << 8))
// Map Group 34 // gMapGroup_IndoorThreeIsland
#define MAP_THREE_ISLAND_HOUSE1 (0 | (34 << 8)) #define MAP_THREE_ISLAND_HOUSE1 (0 | (34 << 8))
#define MAP_THREE_ISLAND_POKEMON_CENTER_1F (1 | (34 << 8)) #define MAP_THREE_ISLAND_POKEMON_CENTER_1F (1 | (34 << 8))
#define MAP_THREE_ISLAND_POKEMON_CENTER_2F (2 | (34 << 8)) #define MAP_THREE_ISLAND_POKEMON_CENTER_2F (2 | (34 << 8))
@@ -476,7 +476,7 @@
#define MAP_THREE_ISLAND_HOUSE4 (6 | (34 << 8)) #define MAP_THREE_ISLAND_HOUSE4 (6 | (34 << 8))
#define MAP_THREE_ISLAND_HOUSE5 (7 | (34 << 8)) #define MAP_THREE_ISLAND_HOUSE5 (7 | (34 << 8))
// Map Group 35 // gMapGroup_IndoorFourIsland
#define MAP_FOUR_ISLAND_POKEMON_DAY_CARE (0 | (35 << 8)) #define MAP_FOUR_ISLAND_POKEMON_DAY_CARE (0 | (35 << 8))
#define MAP_FOUR_ISLAND_POKEMON_CENTER_1F (1 | (35 << 8)) #define MAP_FOUR_ISLAND_POKEMON_CENTER_1F (1 | (35 << 8))
#define MAP_FOUR_ISLAND_POKEMON_CENTER_2F (2 | (35 << 8)) #define MAP_FOUR_ISLAND_POKEMON_CENTER_2F (2 | (35 << 8))
@@ -486,34 +486,34 @@
#define MAP_FOUR_ISLAND_HOUSE2 (6 | (35 << 8)) #define MAP_FOUR_ISLAND_HOUSE2 (6 | (35 << 8))
#define MAP_FOUR_ISLAND_MART (7 | (35 << 8)) #define MAP_FOUR_ISLAND_MART (7 | (35 << 8))
// Map Group 36 // gMapGroup_IndoorFiveIsland
#define MAP_FIVE_ISLAND_POKEMON_CENTER_1F (0 | (36 << 8)) #define MAP_FIVE_ISLAND_POKEMON_CENTER_1F (0 | (36 << 8))
#define MAP_FIVE_ISLAND_POKEMON_CENTER_2F (1 | (36 << 8)) #define MAP_FIVE_ISLAND_POKEMON_CENTER_2F (1 | (36 << 8))
#define MAP_FIVE_ISLAND_HARBOR (2 | (36 << 8)) #define MAP_FIVE_ISLAND_HARBOR (2 | (36 << 8))
#define MAP_FIVE_ISLAND_HOUSE1 (3 | (36 << 8)) #define MAP_FIVE_ISLAND_HOUSE1 (3 | (36 << 8))
#define MAP_FIVE_ISLAND_HOUSE2 (4 | (36 << 8)) #define MAP_FIVE_ISLAND_HOUSE2 (4 | (36 << 8))
// Map Group 37 // gMapGroup_IndoorSixIsland
#define MAP_SIX_ISLAND_POKEMON_CENTER_1F (0 | (37 << 8)) #define MAP_SIX_ISLAND_POKEMON_CENTER_1F (0 | (37 << 8))
#define MAP_SIX_ISLAND_POKEMON_CENTER_2F (1 | (37 << 8)) #define MAP_SIX_ISLAND_POKEMON_CENTER_2F (1 | (37 << 8))
#define MAP_SIX_ISLAND_HARBOR (2 | (37 << 8)) #define MAP_SIX_ISLAND_HARBOR (2 | (37 << 8))
#define MAP_SIX_ISLAND_HOUSE (3 | (37 << 8)) #define MAP_SIX_ISLAND_HOUSE (3 | (37 << 8))
#define MAP_SIX_ISLAND_MART (4 | (37 << 8)) #define MAP_SIX_ISLAND_MART (4 | (37 << 8))
// Map Group 38 // gMapGroup_IndoorThreeIslandRoute
#define MAP_THREE_ISLAND_HARBOR (0 | (38 << 8)) #define MAP_THREE_ISLAND_HARBOR (0 | (38 << 8))
// Map Group 39 // gMapGroup_IndoorFiveIslandRoute
#define MAP_FIVE_ISLAND_RESORT_GORGEOUS_HOUSE (0 | (39 << 8)) #define MAP_FIVE_ISLAND_RESORT_GORGEOUS_HOUSE (0 | (39 << 8))
// Map Group 40 // gMapGroup_IndoorTwoIslandRoute
#define MAP_TWO_ISLAND_CAPE_BRINK_HOUSE (0 | (40 << 8)) #define MAP_TWO_ISLAND_CAPE_BRINK_HOUSE (0 | (40 << 8))
// Map Group 41 // gMapGroup_IndoorSixIslandRoute
#define MAP_SIX_ISLAND_WATER_PATH_HOUSE1 (0 | (41 << 8)) #define MAP_SIX_ISLAND_WATER_PATH_HOUSE1 (0 | (41 << 8))
#define MAP_SIX_ISLAND_WATER_PATH_HOUSE2 (1 | (41 << 8)) #define MAP_SIX_ISLAND_WATER_PATH_HOUSE2 (1 | (41 << 8))
// Map Group 42 // gMapGroup_IndoorSevenIslandRoute
#define MAP_SEVEN_ISLAND_SEVAULT_CANYON_HOUSE (0 | (42 << 8)) #define MAP_SEVEN_ISLAND_SEVAULT_CANYON_HOUSE (0 | (42 << 8))
#define MAP_GROUPS_COUNT 43 #define MAP_GROUPS_COUNT 43
tools/mapjson/mapjson.cpp
+5 -1
View File
@@ -78,6 +78,10 @@ string generate_map_header_text(Json map_data, Json layouts_data) {
ostringstream text; ostringstream text;
text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/"
<< map_data["name"].string_value()
<< "/map.json\n@\n\n";
text << map_data["name"].string_value() << "::\n" text << map_data["name"].string_value() << "::\n"
<< "\t.4byte " << layout["name"].string_value() << "\n"; << "\t.4byte " << layout["name"].string_value() << "\n";
@@ -514,7 +518,7 @@ string generate_map_constants_text(string groups_filepath, Json groups_data) {
int group_num = 0; int group_num = 0;
for (auto &group : groups_data["group_order"].array_items()) { for (auto &group : groups_data["group_order"].array_items()) {
text << "// Map Group " << group_num << "\n"; text << "// " << group.string_value() << "\n";
vector<Json> map_ids; vector<Json> map_ids;
size_t max_length = 0; size_t max_length = 0;