summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/maps/map_groups.json138
-rwxr-xr-xinclude/constants/map_groups.h68
-rwxr-xr-xtools/mapjson/mapjson.cpp2
3 files changed, 104 insertions, 104 deletions
diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json
index 8b455060d..e399cea4a 100644
--- a/data/maps/map_groups.json
+++ b/data/maps/map_groups.json
@@ -1,41 +1,41 @@
{
"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"
- ],
- "gMapGroup0": [
+ "gMapGroup_TownsAndRoutes",
+ "gMapGroup_IndoorLittleroot",
+ "gMapGroup_IndoorOldale",
+ "gMapGroup_IndoorDewford",
+ "gMapGroup_IndoorLavaridge",
+ "gMapGroup_IndoorFallarbor",
+ "gMapGroup_IndoorVerdanturf",
+ "gMapGroup_IndoorPacifidlog",
+ "gMapGroup_IndoorPetalburg",
+ "gMapGroup_IndoorSlateport",
+ "gMapGroup_IndoorMauville",
+ "gMapGroup_IndoorRustboro",
+ "gMapGroup_IndoorFortree",
+ "gMapGroup_IndoorLilycove",
+ "gMapGroup_IndoorMossdeep",
+ "gMapGroup_IndoorSootopolis",
+ "gMapGroup_IndoorEverGrande",
+ "gMapGroup_IndoorRoute104",
+ "gMapGroup_IndoorRoute111",
+ "gMapGroup_IndoorRoute112",
+ "gMapGroup_IndoorRoute114",
+ "gMapGroup_IndoorRoute116",
+ "gMapGroup_IndoorRoute117",
+ "gMapGroup_IndoorRoute121",
+ "gMapGroup_Dungeons",
+ "gMapGroup_IndoorDynamic",
+ "gMapGroup_SpecialArea",
+ "gMapGroup_IndoorRoute104Prototype",
+ "gMapGroup_IndoorRoute109",
+ "gMapGroup_IndoorRoute110",
+ "gMapGroup_IndoorRoute113",
+ "gMapGroup_IndoorRoute123",
+ "gMapGroup_IndoorRoute119",
+ "gMapGroup_IndoorRoute124"
+ ],
+ "gMapGroup_TownsAndRoutes": [
"PetalburgCity",
"SlateportCity",
"MauvilleCity",
@@ -91,21 +91,21 @@
"Underwater3",
"Underwater4"
],
- "gMapGroup1": [
+ "gMapGroup_IndoorLittleroot": [
"LittlerootTown_BrendansHouse_1F",
"LittlerootTown_BrendansHouse_2F",
"LittlerootTown_MaysHouse_1F",
"LittlerootTown_MaysHouse_2F",
"LittlerootTown_ProfessorBirchsLab"
],
- "gMapGroup2": [
+ "gMapGroup_IndoorOldale": [
"OldaleTown_House1",
"OldaleTown_House2",
"OldaleTown_PokemonCenter_1F",
"OldaleTown_PokemonCenter_2F",
"OldaleTown_Mart"
],
- "gMapGroup3": [
+ "gMapGroup_IndoorDewford": [
"DewfordTown_House1",
"DewfordTown_PokemonCenter_1F",
"DewfordTown_PokemonCenter_2F",
@@ -113,7 +113,7 @@
"DewfordTown_Hall",
"DewfordTown_House2"
],
- "gMapGroup4": [
+ "gMapGroup_IndoorLavaridge": [
"LavaridgeTown_HerbShop",
"LavaridgeTown_Gym_1F",
"LavaridgeTown_Gym_B1F",
@@ -122,7 +122,7 @@
"LavaridgeTown_PokemonCenter_1F",
"LavaridgeTown_PokemonCenter_2F"
],
- "gMapGroup5": [
+ "gMapGroup_IndoorFallarbor": [
"FallarborTown_Mart",
"FallarborTown_ContestLobby",
"FallarborTown_ContestHall",
@@ -131,7 +131,7 @@
"FallarborTown_House1",
"FallarborTown_House2"
],
- "gMapGroup6": [
+ "gMapGroup_IndoorVerdanturf": [
"VerdanturfTown_ContestLobby",
"VerdanturfTown_ContestHall",
"VerdanturfTown_Mart",
@@ -141,7 +141,7 @@
"VerdanturfTown_FriendshipRatersHouse",
"VerdanturfTown_House"
],
- "gMapGroup7": [
+ "gMapGroup_IndoorPacifidlog": [
"PacifidlogTown_PokemonCenter_1F",
"PacifidlogTown_PokemonCenter_2F",
"PacifidlogTown_House1",
@@ -150,7 +150,7 @@
"PacifidlogTown_House4",
"PacifidlogTown_House5"
],
- "gMapGroup8": [
+ "gMapGroup_IndoorPetalburg": [
"PetalburgCity_WallysHouse",
"PetalburgCity_Gym",
"PetalburgCity_House1",
@@ -159,7 +159,7 @@
"PetalburgCity_PokemonCenter_2F",
"PetalburgCity_Mart"
],
- "gMapGroup9": [
+ "gMapGroup_IndoorSlateport": [
"SlateportCity_SternsShipyard_1F",
"SlateportCity_SternsShipyard_2F",
"SlateportCity_ContestLobby",
@@ -174,7 +174,7 @@
"SlateportCity_PokemonCenter_2F",
"SlateportCity_Mart"
],
- "gMapGroup10": [
+ "gMapGroup_IndoorMauville": [
"MauvilleCity_Gym",
"MauvilleCity_BikeShop",
"MauvilleCity_House1",
@@ -184,7 +184,7 @@
"MauvilleCity_PokemonCenter_2F",
"MauvilleCity_Mart"
],
- "gMapGroup11": [
+ "gMapGroup_IndoorRustboro": [
"RustboroCity_DevonCorp_1F",
"RustboroCity_DevonCorp_2F",
"RustboroCity_DevonCorp_3F",
@@ -203,7 +203,7 @@
"RustboroCity_Flat2_3F",
"RustboroCity_House3"
],
- "gMapGroup12": [
+ "gMapGroup_IndoorFortree": [
"FortreeCity_House1",
"FortreeCity_Gym",
"FortreeCity_PokemonCenter_1F",
@@ -215,7 +215,7 @@
"FortreeCity_House5",
"FortreeCity_DecorationShop"
],
- "gMapGroup13": [
+ "gMapGroup_IndoorLilycove": [
"LilycoveCity_CoveLilyMotel_1F",
"LilycoveCity_CoveLilyMotel_2F",
"LilycoveCity_LilycoveMuseum_1F",
@@ -241,7 +241,7 @@
"LilycoveCity_DepartmentStoreRooftop",
"LilycoveCity_DepartmentStoreElevator"
],
- "gMapGroup14": [
+ "gMapGroup_IndoorMossdeep": [
"MossdeepCity_Gym",
"MossdeepCity_House1",
"MossdeepCity_House2",
@@ -256,7 +256,7 @@
"MossdeepCity_GameCorner_1F",
"MossdeepCity_GameCorner_B1F"
],
- "gMapGroup15": [
+ "gMapGroup_IndoorSootopolis": [
"SootopolisCity_Gym_1F",
"SootopolisCity_Gym_B1F",
"SootopolisCity_PokemonCenter_1F",
@@ -271,7 +271,7 @@
"SootopolisCity_House7",
"SootopolisCity_House8"
],
- "gMapGroup16": [
+ "gMapGroup_IndoorEverGrande": [
"EverGrandeCity_SidneysRoom",
"EverGrandeCity_PhoebesRoom",
"EverGrandeCity_GlaciasRoom",
@@ -287,33 +287,33 @@
"EverGrandeCity_PokemonCenter_1F",
"EverGrandeCity_PokemonCenter_2F"
],
- "gMapGroup17": [
+ "gMapGroup_IndoorRoute104": [
"Route104_MrBrineysHouse",
"Route104_PrettyPetalFlowerShop"
],
- "gMapGroup18": [
+ "gMapGroup_IndoorRoute111": [
"Route111_WinstrateFamilysHouse",
"Route111_OldLadysRestStop"
],
- "gMapGroup19": [
+ "gMapGroup_IndoorRoute112": [
"Route112_CableCarStation",
"MtChimney_CableCarStation"
],
- "gMapGroup20": [
+ "gMapGroup_IndoorRoute114": [
"Route114_FossilManiacsHouse",
"Route114_FossilManiacsTunnel",
"Route114_LanettesHouse"
],
- "gMapGroup21": [
+ "gMapGroup_IndoorRoute116": [
"Route116_TunnelersRestHouse"
],
- "gMapGroup22": [
+ "gMapGroup_IndoorRoute117": [
"Route117_PokemonDayCare"
],
- "gMapGroup23": [
+ "gMapGroup_IndoorRoute121": [
"Route121_SafariZoneEntrance"
],
- "gMapGroup24": [
+ "gMapGroup_Dungeons": [
"MeteorFalls_1F_1R",
"MeteorFalls_1F_2R",
"MeteorFalls_B1F_1R",
@@ -401,7 +401,7 @@
"SkyPillar_5F",
"SkyPillar_Top"
],
- "gMapGroup25": [
+ "gMapGroup_IndoorDynamic": [
"SecretBase_RedCave1",
"SecretBase_BrownCave1",
"SecretBase_BlueCave1",
@@ -447,7 +447,7 @@
"SSTidalLowerDeck",
"SSTidalRooms"
],
- "gMapGroup26": [
+ "gMapGroup_SpecialArea": [
"SafariZone_Northwest",
"SafariZone_Northeast",
"SafariZone_Southwest",
@@ -461,14 +461,14 @@
"SouthernIsland_Interior",
"SafariZone_RestHouse"
],
- "gMapGroup27": [
+ "gMapGroup_IndoorRoute104Prototype": [
"Route104_Prototype",
"Route104_PrototypePrettyPetalFlowerShop"
],
- "gMapGroup28": [
+ "gMapGroup_IndoorRoute109": [
"Route109_SeashoreHouse"
],
- "gMapGroup29": [
+ "gMapGroup_IndoorRoute110": [
"Route110_TrickHouseEntrance",
"Route110_TrickHouseEnd",
"Route110_TrickHouseCorridor",
@@ -483,18 +483,18 @@
"Route110_SeasideCyclingRoadSouthEntrance",
"Route110_SeasideCyclingRoadNorthEntrance"
],
- "gMapGroup30": [
+ "gMapGroup_IndoorRoute113": [
"Route113_GlassWorkshop"
],
- "gMapGroup31": [
+ "gMapGroup_IndoorRoute123": [
"Route123_BerryMastersHouse"
],
- "gMapGroup32": [
+ "gMapGroup_IndoorRoute119": [
"Route119_WeatherInstitute_1F",
"Route119_WeatherInstitute_2F",
"Route119_House"
],
- "gMapGroup33": [
+ "gMapGroup_IndoorRoute124": [
"Route124_DivingTreasureHuntersHouse"
],
"connections_include_order": [
diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h
index d799d785d..97668d6df 100755
--- a/include/constants/map_groups.h
+++ b/include/constants/map_groups.h
@@ -1,7 +1,7 @@
#ifndef GUARD_CONSTANTS_MAP_GROUPS_H
#define GUARD_CONSTANTS_MAP_GROUPS_H
-// Map Group 0
+// gMapGroup_TownsAndRoutes
#define MAP_PETALBURG_CITY (0 | (0 << 8))
#define MAP_SLATEPORT_CITY (1 | (0 << 8))
#define MAP_MAUVILLE_CITY (2 | (0 << 8))
@@ -57,21 +57,21 @@
#define MAP_UNDERWATER3 (52 | (0 << 8))
#define MAP_UNDERWATER4 (53 | (0 << 8))
-// Map Group 1
+// gMapGroup_IndoorLittleroot
#define MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F (0 | (1 << 8))
#define MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F (1 | (1 << 8))
#define MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F (2 | (1 << 8))
#define MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F (3 | (1 << 8))
#define MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB (4 | (1 << 8))
-// Map Group 2
+// gMapGroup_IndoorOldale
#define MAP_OLDALE_TOWN_HOUSE1 (0 | (2 << 8))
#define MAP_OLDALE_TOWN_HOUSE2 (1 | (2 << 8))
#define MAP_OLDALE_TOWN_POKEMON_CENTER_1F (2 | (2 << 8))
#define MAP_OLDALE_TOWN_POKEMON_CENTER_2F (3 | (2 << 8))
#define MAP_OLDALE_TOWN_MART (4 | (2 << 8))
-// Map Group 3
+// gMapGroup_IndoorDewford
#define MAP_DEWFORD_TOWN_HOUSE1 (0 | (3 << 8))
#define MAP_DEWFORD_TOWN_POKEMON_CENTER_1F (1 | (3 << 8))
#define MAP_DEWFORD_TOWN_POKEMON_CENTER_2F (2 | (3 << 8))
@@ -79,7 +79,7 @@
#define MAP_DEWFORD_TOWN_HALL (4 | (3 << 8))
#define MAP_DEWFORD_TOWN_HOUSE2 (5 | (3 << 8))
-// Map Group 4
+// gMapGroup_IndoorLavaridge
#define MAP_LAVARIDGE_TOWN_HERB_SHOP (0 | (4 << 8))
#define MAP_LAVARIDGE_TOWN_GYM_1F (1 | (4 << 8))
#define MAP_LAVARIDGE_TOWN_GYM_B1F (2 | (4 << 8))
@@ -88,7 +88,7 @@
#define MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F (5 | (4 << 8))
#define MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F (6 | (4 << 8))
-// Map Group 5
+// gMapGroup_IndoorFallarbor
#define MAP_FALLARBOR_TOWN_MART (0 | (5 << 8))
#define MAP_FALLARBOR_TOWN_CONTEST_LOBBY (1 | (5 << 8))
#define MAP_FALLARBOR_TOWN_CONTEST_HALL (2 | (5 << 8))
@@ -97,7 +97,7 @@
#define MAP_FALLARBOR_TOWN_HOUSE1 (5 | (5 << 8))
#define MAP_FALLARBOR_TOWN_HOUSE2 (6 | (5 << 8))
-// Map Group 6
+// gMapGroup_IndoorVerdanturf
#define MAP_VERDANTURF_TOWN_CONTEST_LOBBY (0 | (6 << 8))
#define MAP_VERDANTURF_TOWN_CONTEST_HALL (1 | (6 << 8))
#define MAP_VERDANTURF_TOWN_MART (2 | (6 << 8))
@@ -107,7 +107,7 @@
#define MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE (6 | (6 << 8))
#define MAP_VERDANTURF_TOWN_HOUSE (7 | (6 << 8))
-// Map Group 7
+// gMapGroup_IndoorPacifidlog
#define MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F (0 | (7 << 8))
#define MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F (1 | (7 << 8))
#define MAP_PACIFIDLOG_TOWN_HOUSE1 (2 | (7 << 8))
@@ -116,7 +116,7 @@
#define MAP_PACIFIDLOG_TOWN_HOUSE4 (5 | (7 << 8))
#define MAP_PACIFIDLOG_TOWN_HOUSE5 (6 | (7 << 8))
-// Map Group 8
+// gMapGroup_IndoorPetalburg
#define MAP_PETALBURG_CITY_WALLYS_HOUSE (0 | (8 << 8))
#define MAP_PETALBURG_CITY_GYM (1 | (8 << 8))
#define MAP_PETALBURG_CITY_HOUSE1 (2 | (8 << 8))
@@ -125,7 +125,7 @@
#define MAP_PETALBURG_CITY_POKEMON_CENTER_2F (5 | (8 << 8))
#define MAP_PETALBURG_CITY_MART (6 | (8 << 8))
-// Map Group 9
+// gMapGroup_IndoorSlateport
#define MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F (0 | (9 << 8))
#define MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F (1 | (9 << 8))
#define MAP_SLATEPORT_CITY_CONTEST_LOBBY (2 | (9 << 8))
@@ -140,7 +140,7 @@
#define MAP_SLATEPORT_CITY_POKEMON_CENTER_2F (11 | (9 << 8))
#define MAP_SLATEPORT_CITY_MART (12 | (9 << 8))
-// Map Group 10
+// gMapGroup_IndoorMauville
#define MAP_MAUVILLE_CITY_GYM (0 | (10 << 8))
#define MAP_MAUVILLE_CITY_BIKE_SHOP (1 | (10 << 8))
#define MAP_MAUVILLE_CITY_HOUSE1 (2 | (10 << 8))
@@ -150,7 +150,7 @@
#define MAP_MAUVILLE_CITY_POKEMON_CENTER_2F (6 | (10 << 8))
#define MAP_MAUVILLE_CITY_MART (7 | (10 << 8))
-// Map Group 11
+// gMapGroup_IndoorRustboro
#define MAP_RUSTBORO_CITY_DEVON_CORP_1F (0 | (11 << 8))
#define MAP_RUSTBORO_CITY_DEVON_CORP_2F (1 | (11 << 8))
#define MAP_RUSTBORO_CITY_DEVON_CORP_3F (2 | (11 << 8))
@@ -169,7 +169,7 @@
#define MAP_RUSTBORO_CITY_FLAT2_3F (15 | (11 << 8))
#define MAP_RUSTBORO_CITY_HOUSE3 (16 | (11 << 8))
-// Map Group 12
+// gMapGroup_IndoorFortree
#define MAP_FORTREE_CITY_HOUSE1 (0 | (12 << 8))
#define MAP_FORTREE_CITY_GYM (1 | (12 << 8))
#define MAP_FORTREE_CITY_POKEMON_CENTER_1F (2 | (12 << 8))
@@ -181,7 +181,7 @@
#define MAP_FORTREE_CITY_HOUSE5 (8 | (12 << 8))
#define MAP_FORTREE_CITY_DECORATION_SHOP (9 | (12 << 8))
-// Map Group 13
+// gMapGroup_IndoorLilycove
#define MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F (0 | (13 << 8))
#define MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F (1 | (13 << 8))
#define MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F (2 | (13 << 8))
@@ -207,7 +207,7 @@
#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP (22 | (13 << 8))
#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR (23 | (13 << 8))
-// Map Group 14
+// gMapGroup_IndoorMossdeep
#define MAP_MOSSDEEP_CITY_GYM (0 | (14 << 8))
#define MAP_MOSSDEEP_CITY_HOUSE1 (1 | (14 << 8))
#define MAP_MOSSDEEP_CITY_HOUSE2 (2 | (14 << 8))
@@ -222,7 +222,7 @@
#define MAP_MOSSDEEP_CITY_GAME_CORNER_1F (11 | (14 << 8))
#define MAP_MOSSDEEP_CITY_GAME_CORNER_B1F (12 | (14 << 8))
-// Map Group 15
+// gMapGroup_IndoorSootopolis
#define MAP_SOOTOPOLIS_CITY_GYM_1F (0 | (15 << 8))
#define MAP_SOOTOPOLIS_CITY_GYM_B1F (1 | (15 << 8))
#define MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F (2 | (15 << 8))
@@ -237,7 +237,7 @@
#define MAP_SOOTOPOLIS_CITY_HOUSE7 (11 | (15 << 8))
#define MAP_SOOTOPOLIS_CITY_HOUSE8 (12 | (15 << 8))
-// Map Group 16
+// gMapGroup_IndoorEverGrande
#define MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM (0 | (16 << 8))
#define MAP_EVER_GRANDE_CITY_PHOEBES_ROOM (1 | (16 << 8))
#define MAP_EVER_GRANDE_CITY_GLACIAS_ROOM (2 | (16 << 8))
@@ -253,33 +253,33 @@
#define MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F (12 | (16 << 8))
#define MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F (13 | (16 << 8))
-// Map Group 17
+// gMapGroup_IndoorRoute104
#define MAP_ROUTE104_MR_BRINEYS_HOUSE (0 | (17 << 8))
#define MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP (1 | (17 << 8))
-// Map Group 18
+// gMapGroup_IndoorRoute111
#define MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE (0 | (18 << 8))
#define MAP_ROUTE111_OLD_LADYS_REST_STOP (1 | (18 << 8))
-// Map Group 19
+// gMapGroup_IndoorRoute112
#define MAP_ROUTE112_CABLE_CAR_STATION (0 | (19 << 8))
#define MAP_MT_CHIMNEY_CABLE_CAR_STATION (1 | (19 << 8))
-// Map Group 20
+// gMapGroup_IndoorRoute114
#define MAP_ROUTE114_FOSSIL_MANIACS_HOUSE (0 | (20 << 8))
#define MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL (1 | (20 << 8))
#define MAP_ROUTE114_LANETTES_HOUSE (2 | (20 << 8))
-// Map Group 21
+// gMapGroup_IndoorRoute116
#define MAP_ROUTE116_TUNNELERS_REST_HOUSE (0 | (21 << 8))
-// Map Group 22
+// gMapGroup_IndoorRoute117
#define MAP_ROUTE117_POKEMON_DAY_CARE (0 | (22 << 8))
-// Map Group 23
+// gMapGroup_IndoorRoute121
#define MAP_ROUTE121_SAFARI_ZONE_ENTRANCE (0 | (23 << 8))
-// Map Group 24
+// gMapGroup_Dungeons
#define MAP_METEOR_FALLS_1F_1R (0 | (24 << 8))
#define MAP_METEOR_FALLS_1F_2R (1 | (24 << 8))
#define MAP_METEOR_FALLS_B1F_1R (2 | (24 << 8))
@@ -367,7 +367,7 @@
#define MAP_SKY_PILLAR_5F (84 | (24 << 8))
#define MAP_SKY_PILLAR_TOP (85 | (24 << 8))
-// Map Group 25
+// gMapGroup_IndoorDynamic
#define MAP_SECRET_BASE_RED_CAVE1 (0 | (25 << 8))
#define MAP_SECRET_BASE_BROWN_CAVE1 (1 | (25 << 8))
#define MAP_SECRET_BASE_BLUE_CAVE1 (2 | (25 << 8))
@@ -413,7 +413,7 @@
#define MAP_SS_TIDAL_LOWER_DECK (42 | (25 << 8))
#define MAP_SS_TIDAL_ROOMS (43 | (25 << 8))
-// Map Group 26
+// gMapGroup_SpecialArea
#define MAP_SAFARI_ZONE_NORTHWEST (0 | (26 << 8))
#define MAP_SAFARI_ZONE_NORTHEAST (1 | (26 << 8))
#define MAP_SAFARI_ZONE_SOUTHWEST (2 | (26 << 8))
@@ -427,14 +427,14 @@
#define MAP_SOUTHERN_ISLAND_INTERIOR (10 | (26 << 8))
#define MAP_SAFARI_ZONE_REST_HOUSE (11 | (26 << 8))
-// Map Group 27
+// gMapGroup_IndoorRoute104Prototype
#define MAP_ROUTE104_PROTOTYPE (0 | (27 << 8))
#define MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP (1 | (27 << 8))
-// Map Group 28
+// gMapGroup_IndoorRoute109
#define MAP_ROUTE109_SEASHORE_HOUSE (0 | (28 << 8))
-// Map Group 29
+// gMapGroup_IndoorRoute110
#define MAP_ROUTE110_TRICK_HOUSE_ENTRANCE (0 | (29 << 8))
#define MAP_ROUTE110_TRICK_HOUSE_END (1 | (29 << 8))
#define MAP_ROUTE110_TRICK_HOUSE_CORRIDOR (2 | (29 << 8))
@@ -449,18 +449,18 @@
#define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE (11 | (29 << 8))
#define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE (12 | (29 << 8))
-// Map Group 30
+// gMapGroup_IndoorRoute113
#define MAP_ROUTE113_GLASS_WORKSHOP (0 | (30 << 8))
-// Map Group 31
+// gMapGroup_IndoorRoute123
#define MAP_ROUTE123_BERRY_MASTERS_HOUSE (0 | (31 << 8))
-// Map Group 32
+// gMapGroup_IndoorRoute119
#define MAP_ROUTE119_WEATHER_INSTITUTE_1F (0 | (32 << 8))
#define MAP_ROUTE119_WEATHER_INSTITUTE_2F (1 | (32 << 8))
#define MAP_ROUTE119_HOUSE (2 | (32 << 8))
-// Map Group 33
+// gMapGroup_IndoorRoute124
#define MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE (0 | (33 << 8))
#define MAP_GROUPS_COUNT 34
diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp
index baa93233b..5d5a05bbc 100755
--- a/tools/mapjson/mapjson.cpp
+++ b/tools/mapjson/mapjson.cpp
@@ -373,7 +373,7 @@ string generate_map_constants_text(string groups_filepath, Json groups_data) {
int group_num = 0;
for (auto &group : groups_data["group_order"].array_items()) {
- text << "// Map Group " << group_num << "\n";
+ text << "// " << group.string_value() << "\n";
vector<Json> map_ids;
size_t max_length = 0;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 23:37:57 +0000