summaryrefslogtreecommitdiff
path: root/include/constants
diff options
context:
space:
mode:
Diffstat (limited to 'include/constants')
-rw-r--r--include/constants/flags.h2
-rwxr-xr-xinclude/constants/layouts.h337
-rwxr-xr-xinclude/constants/map_groups.h468
-rw-r--r--include/constants/maps.h464
-rw-r--r--include/constants/region_map_sections.h2
5 files changed, 808 insertions, 465 deletions
diff --git a/include/constants/flags.h b/include/constants/flags.h
index a867fd77e..753024403 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -545,7 +545,7 @@
#define FLAG_HIDE_GRUNTS_HIDEOUTS 0x39C
#define FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE 0x39D
#define FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY 0x39E
-#define FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY 0x39F
+#define FLAG_HIDE_OTHER_TEAM_MT_CHIMNEY 0x39F
#define FLAG_HIDE_PROF_COSMO_FALLARBOR 0x3A0
#define FLAG_HIDE_RIVAL_LAVARIDGE_1 0x3A1
#define FLAG_HIDE_RIVAL_LAVARIDGE_2 0x3A2
diff --git a/include/constants/layouts.h b/include/constants/layouts.h
new file mode 100755
index 000000000..f0008036c
--- /dev/null
+++ b/include/constants/layouts.h
@@ -0,0 +1,337 @@
+#ifndef GUARD_CONSTANTS_LAYOUTS_H
+#define GUARD_CONSTANTS_LAYOUTS_H
+
+#define LAYOUT_PETALBURG_CITY 1
+#define LAYOUT_SLATEPORT_CITY 2
+#define LAYOUT_MAUVILLE_CITY 3
+#define LAYOUT_RUSTBORO_CITY 4
+#define LAYOUT_FORTREE_CITY 5
+#define LAYOUT_LILYCOVE_CITY 6
+#define LAYOUT_MOSSDEEP_CITY 7
+#define LAYOUT_SOOTOPOLIS_CITY 8
+#define LAYOUT_EVER_GRANDE_CITY 9
+#define LAYOUT_LITTLEROOT_TOWN 10
+#define LAYOUT_OLDALE_TOWN 11
+#define LAYOUT_DEWFORD_TOWN 12
+#define LAYOUT_LAVARIDGE_TOWN 13
+#define LAYOUT_FALLARBOR_TOWN 14
+#define LAYOUT_VERDANTURF_TOWN 15
+#define LAYOUT_PACIFIDLOG_TOWN 16
+#define LAYOUT_ROUTE101 17
+#define LAYOUT_ROUTE102 18
+#define LAYOUT_ROUTE103 19
+#define LAYOUT_ROUTE104 20
+#define LAYOUT_ROUTE105 21
+#define LAYOUT_ROUTE106 22
+#define LAYOUT_ROUTE107 23
+#define LAYOUT_ROUTE108 24
+#define LAYOUT_ROUTE109 25
+#define LAYOUT_ROUTE110 26
+#define LAYOUT_ROUTE111 27
+#define LAYOUT_ROUTE112 28
+#define LAYOUT_ROUTE113 29
+#define LAYOUT_ROUTE114 30
+#define LAYOUT_ROUTE115 31
+#define LAYOUT_ROUTE116 32
+#define LAYOUT_ROUTE117 33
+#define LAYOUT_ROUTE118 34
+#define LAYOUT_ROUTE119 35
+#define LAYOUT_ROUTE120 36
+#define LAYOUT_ROUTE121 37
+#define LAYOUT_ROUTE122 38
+#define LAYOUT_ROUTE123 39
+#define LAYOUT_ROUTE124 40
+#define LAYOUT_ROUTE125 41
+#define LAYOUT_ROUTE126 42
+#define LAYOUT_ROUTE127 43
+#define LAYOUT_ROUTE128 44
+#define LAYOUT_ROUTE129 45
+#define LAYOUT_UNREFERENCED_MAP 46
+#define LAYOUT_ROUTE131 47
+#define LAYOUT_ROUTE132 48
+#define LAYOUT_ROUTE133 49
+#define LAYOUT_ROUTE134 50
+#define LAYOUT_UNDERWATER2 51
+#define LAYOUT_UNDERWATER3 52
+#define LAYOUT_UNDERWATER4 53
+#define LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F 54
+#define LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F 55
+#define LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_1F 56
+#define LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F 57
+#define LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB 58
+#define LAYOUT_HOUSE1 59
+#define LAYOUT_HOUSE2 60
+#define LAYOUT_POKEMON_CENTER_1F 61
+#define LAYOUT_POKEMON_CENTER_2F 62
+#define LAYOUT_POKE_MART 63
+#define LAYOUT_HOUSE3 64
+#define LAYOUT_DEWFORD_TOWN_GYM 65
+#define LAYOUT_DEWFORD_TOWN_HALL 66
+#define LAYOUT_HOUSE4 67
+#define LAYOUT_LAVARIDGE_TOWN_HERB_SHOP 68
+#define LAYOUT_LAVARIDGE_TOWN_GYM_1F 69
+#define LAYOUT_LAVARIDGE_TOWN_GYM_B1F 70
+#define LAYOUT_LAVARIDGE_TOWN_POKEMON_CENTER_1F 71
+#define LAYOUT_CONTEST_LOBBY 72
+#define LAYOUT_CONTEST_HALL 73
+#define LAYOUT_LILYCOVE_CITY_HOUSE2 74
+#define LAYOUT_UNKNOWN_MAP_082CF564 75
+#define LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE 76
+#define LAYOUT_PACIFIDLOG_TOWN_HOUSE1 77
+#define LAYOUT_PACIFIDLOG_TOWN_HOUSE2 78
+#define LAYOUT_PETALBURG_CITY_GYM 79
+#define LAYOUT_HOUSE_WITH_BED 80
+#define LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_1F 81
+#define LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_2F 82
+#define LAYOUT_UNKNOWN_MAP_082D05D8 83
+#define LAYOUT_UNKNOWN_MAP_082D05FC 84
+#define LAYOUT_SLATEPORT_CITY_POKEMON_FAN_CLUB 85
+#define LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_1F 86
+#define LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_2F 87
+#define LAYOUT_HARBOR 88
+#define LAYOUT_MAUVILLE_CITY_GYM 89
+#define LAYOUT_MAUVILLE_CITY_BIKE_SHOP 90
+#define LAYOUT_MAUVILLE_CITY_GAME_CORNER 91
+#define LAYOUT_RUSTBORO_CITY_DEVON_CORP_1F 92
+#define LAYOUT_RUSTBORO_CITY_DEVON_CORP_2F 93
+#define LAYOUT_RUSTBORO_CITY_GYM 94
+#define LAYOUT_RUSTBORO_CITY_POKEMON_SCHOOL 95
+#define LAYOUT_RUSTBORO_CITY_HOUSE 96
+#define LAYOUT_RUSTBORO_CITY_HOUSE1 97
+#define LAYOUT_RUSTBORO_CITY_CUTTERS_HOUSE 98
+#define LAYOUT_FORTREE_CITY_HOUSE1 99
+#define LAYOUT_FORTREE_CITY_GYM 100
+#define LAYOUT_FORTREE_CITY_HOUSE2 101
+#define LAYOUT_ROUTE104_MR_BRINEYS_HOUSE 102
+#define LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F 103
+#define LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F 104
+#define LAYOUT_LILYCOVE_CITY_CONTEST_LOBBY 105
+#define LAYOUT_LILYCOVE_CITY_CONTEST_HALL 106
+#define LAYOUT_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB 107
+#define LAYOUT_LILYCOVE_CITY_EMPTY_MAP 108
+#define LAYOUT_MOSSDEEP_CITY_GYM 109
+#define LAYOUT_SOOTOPOLIS_CITY_GYM_1F 110
+#define LAYOUT_SOOTOPOLIS_CITY_GYM_B1F 111
+#define LAYOUT_EVER_GRANDE_CITY_SIDNEYS_ROOM 112
+#define LAYOUT_EVER_GRANDE_CITY_PHOEBES_ROOM 113
+#define LAYOUT_EVER_GRANDE_CITY_GLACIAS_ROOM 114
+#define LAYOUT_EVER_GRANDE_CITY_DRAKES_ROOM 115
+#define LAYOUT_EVER_GRANDE_CITY_CHAMPIONS_ROOM 116
+#define LAYOUT_EVER_GRANDE_CITY_SHORT_CORRIDOR 117
+#define LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP 118
+#define LAYOUT_CABLE_CAR_STATION 119
+#define LAYOUT_ROUTE114_FOSSIL_MANIACS_HOUSE 120
+#define LAYOUT_ROUTE114_FOSSIL_MANIACS_TUNNEL 121
+#define LAYOUT_ROUTE114_LANETTES_HOUSE 122
+#define LAYOUT_ROUTE116_TUNNELERS_REST_HOUSE 123
+#define LAYOUT_ROUTE117_POKEMON_DAY_CARE 124
+#define LAYOUT_ROUTE121_SAFARI_ZONE_ENTRANCE 125
+#define LAYOUT_METEOR_FALLS_1F_1R 126
+#define LAYOUT_METEOR_FALLS_1F_2R 127
+#define LAYOUT_METEOR_FALLS_B1F_1R 128
+#define LAYOUT_METEOR_FALLS_B1F_2R 129
+#define LAYOUT_RUSTURF_TUNNEL 130
+#define LAYOUT_UNDERWATER_SOOTOPOLIS_CITY 131
+#define LAYOUT_DESERT_RUINS 132
+#define LAYOUT_GRANITE_CAVE_1F 133
+#define LAYOUT_GRANITE_CAVE_B1F 134
+#define LAYOUT_GRANITE_CAVE_B2F 135
+#define LAYOUT_PETALBURG_WOODS 136
+#define LAYOUT_MT_CHIMNEY 137
+#define LAYOUT_MT_PYRE_1F 138
+#define LAYOUT_MT_PYRE_2F 139
+#define LAYOUT_MT_PYRE_3F 140
+#define LAYOUT_MT_PYRE_4F 141
+#define LAYOUT_MT_PYRE_5F 142
+#define LAYOUT_MT_PYRE_6F 143
+#define LAYOUT_AQUA_HIDEOUT_1F 144
+#define LAYOUT_AQUA_HIDEOUT_B1F 145
+#define LAYOUT_AQUA_HIDEOUT_B2F 146
+#define LAYOUT_UNDERWATER_SEAFLOOR_CAVERN 147
+#define LAYOUT_SEAFLOOR_CAVERN_ENTRANCE 148
+#define LAYOUT_SEAFLOOR_CAVERN_ROOM1 149
+#define LAYOUT_SEAFLOOR_CAVERN_ROOM2 150
+#define LAYOUT_SEAFLOOR_CAVERN_ROOM3 151
+#define LAYOUT_SEAFLOOR_CAVERN_ROOM4 152
+#define LAYOUT_SEAFLOOR_CAVERN_ROOM5 153
+#define LAYOUT_SEAFLOOR_CAVERN_ROOM6 154
+#define LAYOUT_SEAFLOOR_CAVERN_ROOM7 155
+#define LAYOUT_SEAFLOOR_CAVERN_ROOM8 156
+#define LAYOUT_SEAFLOOR_CAVERN_ROOM9 157
+#define LAYOUT_CAVE_OF_ORIGIN_ENTRANCE 158
+#define LAYOUT_CAVE_OF_ORIGIN_1F 159
+#define LAYOUT_CAVE_OF_ORIGIN_B1F 160
+#define LAYOUT_CAVE_OF_ORIGIN_B2F 161
+#define LAYOUT_CAVE_OF_ORIGIN_B3F 162
+#define LAYOUT_CAVE_OF_ORIGIN_B4F 163
+#define LAYOUT_VICTORY_ROAD_1F 164
+#define LAYOUT_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM 165
+#define LAYOUT_SHOAL_CAVE_LOW_TIDE_INNER_ROOM 166
+#define LAYOUT_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM 167
+#define LAYOUT_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM 168
+#define LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM 169
+#define LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM 170
+#define LAYOUT_UNKNOWN_MAP_082E55C8 171
+#define LAYOUT_UNKNOWN_MAP_082E55EC 172
+#define LAYOUT_UNKNOWN_MAP_082E5610 173
+#define LAYOUT_UNKNOWN_MAP_082E5634 174
+#define LAYOUT_UNKNOWN_MAP_082E5658 175
+#define LAYOUT_UNKNOWN_MAP_082E567C 176
+#define LAYOUT_UNKNOWN_MAP_082E56A0 177
+#define LAYOUT_UNKNOWN_MAP_082E56C4 178
+#define LAYOUT_UNKNOWN_MAP_082E56E8 179
+#define LAYOUT_UNKNOWN_MAP_082E570C 180
+#define LAYOUT_UNKNOWN_MAP_082E5730 181
+#define LAYOUT_UNKNOWN_MAP_082E5754 182
+#define LAYOUT_UNKNOWN_MAP_082E5778 183
+#define LAYOUT_UNKNOWN_MAP_082E579C 184
+#define LAYOUT_NEW_MAUVILLE_ENTRANCE 185
+#define LAYOUT_NEW_MAUVILLE_INSIDE 186
+#define LAYOUT_ABANDONED_SHIP_DECK 187
+#define LAYOUT_ABANDONED_SHIP_CORRIDORS_1F 188
+#define LAYOUT_ABANDONED_SHIP_ROOMS_1F 189
+#define LAYOUT_ABANDONED_SHIP_CORRIDORS_B1F 190
+#define LAYOUT_ABANDONED_SHIP_ROOMS_B1F 191
+#define LAYOUT_ABANDONED_SHIP_ROOMS2_B1F 192
+#define LAYOUT_ABANDONED_SHIP_UNDERWATER1 193
+#define LAYOUT_ABANDONED_SHIP_ROOM_B1F 194
+#define LAYOUT_ABANDONED_SHIP_ROOMS2_1F 195
+#define LAYOUT_ABANDONED_SHIP_CAPTAINS_OFFICE 196
+#define LAYOUT_ABANDONED_SHIP_UNDERWATER2 197
+#define LAYOUT_SECRET_BASE_RED_CAVE1 198
+#define LAYOUT_SECRET_BASE_BROWN_CAVE1 199
+#define LAYOUT_SECRET_BASE_BLUE_CAVE1 200
+#define LAYOUT_SECRET_BASE_YELLOW_CAVE1 201
+#define LAYOUT_SECRET_BASE_TREE1 202
+#define LAYOUT_SECRET_BASE_SHRUB1 203
+#define LAYOUT_SECRET_BASE_RED_CAVE2 204
+#define LAYOUT_SECRET_BASE_BROWN_CAVE2 205
+#define LAYOUT_SECRET_BASE_BLUE_CAVE2 206
+#define LAYOUT_SECRET_BASE_YELLOW_CAVE2 207
+#define LAYOUT_SECRET_BASE_TREE2 208
+#define LAYOUT_SECRET_BASE_SHRUB2 209
+#define LAYOUT_SECRET_BASE_RED_CAVE3 210
+#define LAYOUT_SECRET_BASE_BROWN_CAVE3 211
+#define LAYOUT_SECRET_BASE_BLUE_CAVE3 212
+#define LAYOUT_SECRET_BASE_YELLOW_CAVE3 213
+#define LAYOUT_SECRET_BASE_TREE3 214
+#define LAYOUT_SECRET_BASE_SHRUB3 215
+#define LAYOUT_SECRET_BASE_RED_CAVE4 216
+#define LAYOUT_SECRET_BASE_BROWN_CAVE4 217
+#define LAYOUT_SECRET_BASE_BLUE_CAVE4 218
+#define LAYOUT_SECRET_BASE_YELLOW_CAVE4 219
+#define LAYOUT_SECRET_BASE_TREE4 220
+#define LAYOUT_SECRET_BASE_SHRUB4 221
+#define LAYOUT_SINGLE_BATTLE_COLOSSEUM 222
+#define LAYOUT_TRADE_CENTER 223
+#define LAYOUT_RECORD_CORNER 224
+#define LAYOUT_DOUBLE_BATTLE_COLOSSEUM 225
+#define LAYOUT_LINK_CONTEST_ROOM1 226
+#define LAYOUT_UNKNOWN_MAP_25_29 227
+#define LAYOUT_UNKNOWN_MAP_25_30 228
+#define LAYOUT_UNKNOWN_MAP_25_31 229
+#define LAYOUT_UNKNOWN_MAP_25_32 230
+#define LAYOUT_UNKNOWN_MAP_25_33 231
+#define LAYOUT_UNKNOWN_MAP_25_34 232
+#define LAYOUT_LINK_CONTEST_ROOM2 233
+#define LAYOUT_LINK_CONTEST_ROOM3 234
+#define LAYOUT_LINK_CONTEST_ROOM4 235
+#define LAYOUT_LINK_CONTEST_ROOM5 236
+#define LAYOUT_LINK_CONTEST_ROOM6 237
+#define LAYOUT_INSIDE_OF_TRUCK 238
+#define LAYOUT_SAFARI_ZONE_NORTHWEST 239
+#define LAYOUT_SAFARI_ZONE_NORTHEAST 240
+#define LAYOUT_SAFARI_ZONE_SOUTHWEST 241
+#define LAYOUT_SAFARI_ZONE_SOUTHEAST 242
+#define LAYOUT_UNKNOWN_MAP_082EDF30 243
+#define LAYOUT_ROUTE109_SEASHORE_HOUSE 244
+#define LAYOUT_ROUTE110_TRICK_HOUSE_ENTRANCE 245
+#define LAYOUT_ROUTE110_TRICK_HOUSE_END 246
+#define LAYOUT_ROUTE110_TRICK_HOUSE_CORRIDOR 247
+#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE1 248
+#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE2 249
+#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE3 250
+#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE4 251
+#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE5 252
+#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE6 253
+#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE7 254
+#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE8 255
+#define LAYOUT_FORTREE_CITY_DECORATION_SHOP 256
+#define LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRACE 257
+#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_1F 258
+#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_2F 259
+#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_3F 260
+#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_4F 261
+#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_5F 262
+#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP 263
+#define LAYOUT_ROUTE130 264
+#define LAYOUT_BATTLE_TOWER_LOBBY 265
+#define LAYOUT_BATTLE_TOWER_OUTSIDE 266
+#define LAYOUT_BATTLE_TOWER_ELEVATOR 267
+#define LAYOUT_BATTLE_TOWER_CORRIDOR 268
+#define LAYOUT_BATTLE_TOWER_BATTLE_ROOM 269
+#define LAYOUT_RUSTBORO_CITY_DEVON_CORP_3F 270
+#define LAYOUT_EVER_GRANDE_CITY_POKEMON_LEAGUE 271
+#define LAYOUT_ROUTE119_WEATHER_INSTITUTE_1F 272
+#define LAYOUT_ROUTE119_WEATHER_INSTITUTE_2F 273
+#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR 274
+#define LAYOUT_UNDERWATER1 275
+#define LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_1F 276
+#define LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_2F 277
+#define LAYOUT_SS_TIDAL_CORRIDOR 278
+#define LAYOUT_SS_TIDAL_LOWER_DECK 279
+#define LAYOUT_SS_TIDAL_ROOMS 280
+#define LAYOUT_ISLAND_CAVE 281
+#define LAYOUT_ANCIENT_TOMB 282
+#define LAYOUT_UNDERWATER_ROUTE134 283
+#define LAYOUT_UNDERWATER_SEALED_CHAMBER 284
+#define LAYOUT_SEALED_CHAMBER_OUTER_ROOM 285
+#define LAYOUT_VICTORY_ROAD_B1F 286
+#define LAYOUT_VICTORY_ROAD_B2F 287
+#define LAYOUT_ROUTE104_PROTOTYPE 288
+#define LAYOUT_GRANITE_CAVE_STEVENS_ROOM 289
+#define LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS 290
+#define LAYOUT_SOUTHERN_ISLAND_EXTERIOR 291
+#define LAYOUT_SOUTHERN_ISLAND_INTERIOR 292
+#define LAYOUT_JAGGED_PASS 293
+#define LAYOUT_FIERY_PATH 294
+#define LAYOUT_RUSTBORO_CITY_FLAT2_1F 295
+#define LAYOUT_RUSTBORO_CITY_FLAT2_2F 296
+#define LAYOUT_RUSTBORO_CITY_FLAT2_3F 297
+#define LAYOUT_SOOTOPOLIS_CITY_HOUSE8 298
+#define LAYOUT_EVER_GRANDE_CITY_HALL_OF_FAME 299
+#define LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_1F 300
+#define LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_2F 301
+#define LAYOUT_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE 302
+#define LAYOUT_MT_PYRE_EXTERIOR 303
+#define LAYOUT_MT_PYRE_SUMMIT 304
+#define LAYOUT_SEALED_CHAMBER_INNER_ROOM 305
+#define LAYOUT_MOSSDEEP_CITY_GAME_CORNER_1F 306
+#define LAYOUT_MOSSDEEP_CITY_GAME_CORNER_B1F 307
+#define LAYOUT_SOOTOPOLIS_CITY_HOUSE1 308
+#define LAYOUT_SOOTOPOLIS_CITY_HOUSE2 309
+#define LAYOUT_SOOTOPOLIS_CITY_HOUSE3 310
+#define LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS 311
+#define LAYOUT_SCORCHED_SLAB 312
+#define LAYOUT_UNKNOWN_MAP_082FF894 313
+#define LAYOUT_RUSTBORO_CITY_FLAT1_1F 314
+#define LAYOUT_RUSTBORO_CITY_FLAT1_2F 315
+#define LAYOUT_EVER_GRANDE_CITY_CORRIDOR4 316
+#define LAYOUT_MAGMA_HIDEOUT_1F 317
+#define LAYOUT_MAGMA_HIDEOUT_B1F 318
+#define LAYOUT_MAGMA_HIDEOUT_B2F 319
+#define LAYOUT_UNKNOWN_MAP_08302970 320
+#define LAYOUT_SKY_PILLAR_ENTRANCE 321
+#define LAYOUT_SKY_PILLAR_OUTSIDE 322
+#define LAYOUT_SKY_PILLAR_1F 323
+#define LAYOUT_SKY_PILLAR_2F 324
+#define LAYOUT_SKY_PILLAR_3F 325
+#define LAYOUT_SKY_PILLAR_4F 326
+#define LAYOUT_UNKNOWN_MAP_083041B4 327
+#define LAYOUT_MOSSDEEP_CITY_STEVENS_HOUSE 328
+#define LAYOUT_SHOAL_CAVE_LOW_TIDE_ICE_ROOM 329
+#define LAYOUT_SAFARI_ZONE_REST_HOUSE 330
+#define LAYOUT_SKY_PILLAR_5F 331
+#define LAYOUT_SKY_PILLAR_TOP 332
+
+#endif // GUARD_CONSTANTS_LAYOUTS_H
diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h
new file mode 100755
index 000000000..d799d785d
--- /dev/null
+++ b/include/constants/map_groups.h
@@ -0,0 +1,468 @@
+#ifndef GUARD_CONSTANTS_MAP_GROUPS_H
+#define GUARD_CONSTANTS_MAP_GROUPS_H
+
+// Map Group 0
+#define MAP_PETALBURG_CITY (0 | (0 << 8))
+#define MAP_SLATEPORT_CITY (1 | (0 << 8))
+#define MAP_MAUVILLE_CITY (2 | (0 << 8))
+#define MAP_RUSTBORO_CITY (3 | (0 << 8))
+#define MAP_FORTREE_CITY (4 | (0 << 8))
+#define MAP_LILYCOVE_CITY (5 | (0 << 8))
+#define MAP_MOSSDEEP_CITY (6 | (0 << 8))
+#define MAP_SOOTOPOLIS_CITY (7 | (0 << 8))
+#define MAP_EVER_GRANDE_CITY (8 | (0 << 8))
+#define MAP_LITTLEROOT_TOWN (9 | (0 << 8))
+#define MAP_OLDALE_TOWN (10 | (0 << 8))
+#define MAP_DEWFORD_TOWN (11 | (0 << 8))
+#define MAP_LAVARIDGE_TOWN (12 | (0 << 8))
+#define MAP_FALLARBOR_TOWN (13 | (0 << 8))
+#define MAP_VERDANTURF_TOWN (14 | (0 << 8))
+#define MAP_PACIFIDLOG_TOWN (15 | (0 << 8))
+#define MAP_ROUTE101 (16 | (0 << 8))
+#define MAP_ROUTE102 (17 | (0 << 8))
+#define MAP_ROUTE103 (18 | (0 << 8))
+#define MAP_ROUTE104 (19 | (0 << 8))
+#define MAP_ROUTE105 (20 | (0 << 8))
+#define MAP_ROUTE106 (21 | (0 << 8))
+#define MAP_ROUTE107 (22 | (0 << 8))
+#define MAP_ROUTE108 (23 | (0 << 8))
+#define MAP_ROUTE109 (24 | (0 << 8))
+#define MAP_ROUTE110 (25 | (0 << 8))
+#define MAP_ROUTE111 (26 | (0 << 8))
+#define MAP_ROUTE112 (27 | (0 << 8))
+#define MAP_ROUTE113 (28 | (0 << 8))
+#define MAP_ROUTE114 (29 | (0 << 8))
+#define MAP_ROUTE115 (30 | (0 << 8))
+#define MAP_ROUTE116 (31 | (0 << 8))
+#define MAP_ROUTE117 (32 | (0 << 8))
+#define MAP_ROUTE118 (33 | (0 << 8))
+#define MAP_ROUTE119 (34 | (0 << 8))
+#define MAP_ROUTE120 (35 | (0 << 8))
+#define MAP_ROUTE121 (36 | (0 << 8))
+#define MAP_ROUTE122 (37 | (0 << 8))
+#define MAP_ROUTE123 (38 | (0 << 8))
+#define MAP_ROUTE124 (39 | (0 << 8))
+#define MAP_ROUTE125 (40 | (0 << 8))
+#define MAP_ROUTE126 (41 | (0 << 8))
+#define MAP_ROUTE127 (42 | (0 << 8))
+#define MAP_ROUTE128 (43 | (0 << 8))
+#define MAP_ROUTE129 (44 | (0 << 8))
+#define MAP_ROUTE130 (45 | (0 << 8))
+#define MAP_ROUTE131 (46 | (0 << 8))
+#define MAP_ROUTE132 (47 | (0 << 8))
+#define MAP_ROUTE133 (48 | (0 << 8))
+#define MAP_ROUTE134 (49 | (0 << 8))
+#define MAP_UNDERWATER1 (50 | (0 << 8))
+#define MAP_UNDERWATER2 (51 | (0 << 8))
+#define MAP_UNDERWATER3 (52 | (0 << 8))
+#define MAP_UNDERWATER4 (53 | (0 << 8))
+
+// Map Group 1
+#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
+#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
+#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))
+#define MAP_DEWFORD_TOWN_GYM (3 | (3 << 8))
+#define MAP_DEWFORD_TOWN_HALL (4 | (3 << 8))
+#define MAP_DEWFORD_TOWN_HOUSE2 (5 | (3 << 8))
+
+// Map Group 4
+#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))
+#define MAP_LAVARIDGE_TOWN_HOUSE (3 | (4 << 8))
+#define MAP_LAVARIDGE_TOWN_MART (4 | (4 << 8))
+#define MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F (5 | (4 << 8))
+#define MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F (6 | (4 << 8))
+
+// Map Group 5
+#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))
+#define MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F (3 | (5 << 8))
+#define MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F (4 | (5 << 8))
+#define MAP_FALLARBOR_TOWN_HOUSE1 (5 | (5 << 8))
+#define MAP_FALLARBOR_TOWN_HOUSE2 (6 | (5 << 8))
+
+// Map Group 6
+#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))
+#define MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F (3 | (6 << 8))
+#define MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F (4 | (6 << 8))
+#define MAP_VERDANTURF_TOWN_WANDAS_HOUSE (5 | (6 << 8))
+#define MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE (6 | (6 << 8))
+#define MAP_VERDANTURF_TOWN_HOUSE (7 | (6 << 8))
+
+// Map Group 7
+#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))
+#define MAP_PACIFIDLOG_TOWN_HOUSE2 (3 | (7 << 8))
+#define MAP_PACIFIDLOG_TOWN_HOUSE3 (4 | (7 << 8))
+#define MAP_PACIFIDLOG_TOWN_HOUSE4 (5 | (7 << 8))
+#define MAP_PACIFIDLOG_TOWN_HOUSE5 (6 | (7 << 8))
+
+// Map Group 8
+#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))
+#define MAP_PETALBURG_CITY_HOUSE2 (3 | (8 << 8))
+#define MAP_PETALBURG_CITY_POKEMON_CENTER_1F (4 | (8 << 8))
+#define MAP_PETALBURG_CITY_POKEMON_CENTER_2F (5 | (8 << 8))
+#define MAP_PETALBURG_CITY_MART (6 | (8 << 8))
+
+// Map Group 9
+#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))
+#define MAP_SLATEPORT_CITY_CONTEST_HALL (3 | (9 << 8))
+#define MAP_SLATEPORT_CITY_HOUSE1 (4 | (9 << 8))
+#define MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB (5 | (9 << 8))
+#define MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F (6 | (9 << 8))
+#define MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F (7 | (9 << 8))
+#define MAP_SLATEPORT_CITY_HARBOR (8 | (9 << 8))
+#define MAP_SLATEPORT_CITY_HOUSE2 (9 | (9 << 8))
+#define MAP_SLATEPORT_CITY_POKEMON_CENTER_1F (10 | (9 << 8))
+#define MAP_SLATEPORT_CITY_POKEMON_CENTER_2F (11 | (9 << 8))
+#define MAP_SLATEPORT_CITY_MART (12 | (9 << 8))
+
+// Map Group 10
+#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))
+#define MAP_MAUVILLE_CITY_GAME_CORNER (3 | (10 << 8))
+#define MAP_MAUVILLE_CITY_HOUSE2 (4 | (10 << 8))
+#define MAP_MAUVILLE_CITY_POKEMON_CENTER_1F (5 | (10 << 8))
+#define MAP_MAUVILLE_CITY_POKEMON_CENTER_2F (6 | (10 << 8))
+#define MAP_MAUVILLE_CITY_MART (7 | (10 << 8))
+
+// Map Group 11
+#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))
+#define MAP_RUSTBORO_CITY_GYM (3 | (11 << 8))
+#define MAP_RUSTBORO_CITY_POKEMON_SCHOOL (4 | (11 << 8))
+#define MAP_RUSTBORO_CITY_POKEMON_CENTER_1F (5 | (11 << 8))
+#define MAP_RUSTBORO_CITY_POKEMON_CENTER_2F (6 | (11 << 8))
+#define MAP_RUSTBORO_CITY_MART (7 | (11 << 8))
+#define MAP_RUSTBORO_CITY_FLAT1_1F (8 | (11 << 8))
+#define MAP_RUSTBORO_CITY_FLAT1_2F (9 | (11 << 8))
+#define MAP_RUSTBORO_CITY_HOUSE1 (10 | (11 << 8))
+#define MAP_RUSTBORO_CITY_CUTTERS_HOUSE (11 | (11 << 8))
+#define MAP_RUSTBORO_CITY_HOUSE2 (12 | (11 << 8))
+#define MAP_RUSTBORO_CITY_FLAT2_1F (13 | (11 << 8))
+#define MAP_RUSTBORO_CITY_FLAT2_2F (14 | (11 << 8))
+#define MAP_RUSTBORO_CITY_FLAT2_3F (15 | (11 << 8))
+#define MAP_RUSTBORO_CITY_HOUSE3 (16 | (11 << 8))
+
+// Map Group 12
+#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))
+#define MAP_FORTREE_CITY_POKEMON_CENTER_2F (3 | (12 << 8))
+#define MAP_FORTREE_CITY_MART (4 | (12 << 8))
+#define MAP_FORTREE_CITY_HOUSE2 (5 | (12 << 8))
+#define MAP_FORTREE_CITY_HOUSE3 (6 | (12 << 8))
+#define MAP_FORTREE_CITY_HOUSE4 (7 | (12 << 8))
+#define MAP_FORTREE_CITY_HOUSE5 (8 | (12 << 8))
+#define MAP_FORTREE_CITY_DECORATION_SHOP (9 | (12 << 8))
+
+// Map Group 13
+#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))
+#define MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F (3 | (13 << 8))
+#define MAP_LILYCOVE_CITY_CONTEST_LOBBY (4 | (13 << 8))
+#define MAP_LILYCOVE_CITY_CONTEST_HALL (5 | (13 << 8))
+#define MAP_LILYCOVE_CITY_POKEMON_CENTER_1F (6 | (13 << 8))
+#define MAP_LILYCOVE_CITY_POKEMON_CENTER_2F (7 | (13 << 8))
+#define MAP_LILYCOVE_CITY_UNUSED_MART (8 | (13 << 8))
+#define MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB (9 | (13 << 8))
+#define MAP_LILYCOVE_CITY_HARBOR (10 | (13 << 8))
+#define MAP_LILYCOVE_CITY_EMPTY_MAP (11 | (13 << 8))
+#define MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE (12 | (13 << 8))
+#define MAP_LILYCOVE_CITY_HOUSE1 (13 | (13 << 8))
+#define MAP_LILYCOVE_CITY_HOUSE2 (14 | (13 << 8))
+#define MAP_LILYCOVE_CITY_HOUSE3 (15 | (13 << 8))
+#define MAP_LILYCOVE_CITY_HOUSE4 (16 | (13 << 8))
+#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F (17 | (13 << 8))
+#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F (18 | (13 << 8))
+#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F (19 | (13 << 8))
+#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F (20 | (13 << 8))
+#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F (21 | (13 << 8))
+#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP (22 | (13 << 8))
+#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR (23 | (13 << 8))
+
+// Map Group 14
+#define MAP_MOSSDEEP_CITY_GYM (0 | (14 << 8))
+#define MAP_MOSSDEEP_CITY_HOUSE1 (1 | (14 << 8))
+#define MAP_MOSSDEEP_CITY_HOUSE2 (2 | (14 << 8))
+#define MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F (3 | (14 << 8))
+#define MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F (4 | (14 << 8))
+#define MAP_MOSSDEEP_CITY_MART (5 | (14 << 8))
+#define MAP_MOSSDEEP_CITY_HOUSE3 (6 | (14 << 8))
+#define MAP_MOSSDEEP_CITY_STEVENS_HOUSE (7 | (14 << 8))
+#define MAP_MOSSDEEP_CITY_HOUSE4 (8 | (14 << 8))
+#define MAP_MOSSDEEP_CITY_SPACE_CENTER_1F (9 | (14 << 8))
+#define MAP_MOSSDEEP_CITY_SPACE_CENTER_2F (10 | (14 << 8))
+#define MAP_MOSSDEEP_CITY_GAME_CORNER_1F (11 | (14 << 8))
+#define MAP_MOSSDEEP_CITY_GAME_CORNER_B1F (12 | (14 << 8))
+
+// Map Group 15
+#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))
+#define MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F (3 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_MART (4 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_HOUSE1 (5 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_HOUSE2 (6 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_HOUSE3 (7 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_HOUSE4 (8 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_HOUSE5 (9 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_HOUSE6 (10 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_HOUSE7 (11 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_HOUSE8 (12 | (15 << 8))
+
+// Map Group 16
+#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))
+#define MAP_EVER_GRANDE_CITY_DRAKES_ROOM (3 | (16 << 8))
+#define MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM (4 | (16 << 8))
+#define MAP_EVER_GRANDE_CITY_CORRIDOR1 (5 | (16 << 8))
+#define MAP_EVER_GRANDE_CITY_CORRIDOR2 (6 | (16 << 8))
+#define MAP_EVER_GRANDE_CITY_CORRIDOR3 (7 | (16 << 8))
+#define MAP_EVER_GRANDE_CITY_CORRIDOR4 (8 | (16 << 8))
+#define MAP_EVER_GRANDE_CITY_CORRIDOR5 (9 | (16 << 8))
+#define MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE (10 | (16 << 8))
+#define MAP_EVER_GRANDE_CITY_HALL_OF_FAME (11 | (16 << 8))
+#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
+#define MAP_ROUTE104_MR_BRINEYS_HOUSE (0 | (17 << 8))
+#define MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP (1 | (17 << 8))
+
+// Map Group 18
+#define MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE (0 | (18 << 8))
+#define MAP_ROUTE111_OLD_LADYS_REST_STOP (1 | (18 << 8))
+
+// Map Group 19
+#define MAP_ROUTE112_CABLE_CAR_STATION (0 | (19 << 8))
+#define MAP_MT_CHIMNEY_CABLE_CAR_STATION (1 | (19 << 8))
+
+// Map Group 20
+#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
+#define MAP_ROUTE116_TUNNELERS_REST_HOUSE (0 | (21 << 8))
+
+// Map Group 22
+#define MAP_ROUTE117_POKEMON_DAY_CARE (0 | (22 << 8))
+
+// Map Group 23
+#define MAP_ROUTE121_SAFARI_ZONE_ENTRANCE (0 | (23 << 8))
+
+// Map Group 24
+#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))
+#define MAP_METEOR_FALLS_B1F_2R (3 | (24 << 8))
+#define MAP_RUSTURF_TUNNEL (4 | (24 << 8))
+#define MAP_UNDERWATER_SOOTOPOLIS_CITY (5 | (24 << 8))
+#define MAP_DESERT_RUINS (6 | (24 << 8))
+#define MAP_GRANITE_CAVE_1F (7 | (24 << 8))
+#define MAP_GRANITE_CAVE_B1F (8 | (24 << 8))
+#define MAP_GRANITE_CAVE_B2F (9 | (24 << 8))
+#define MAP_GRANITE_CAVE_STEVENS_ROOM (10 | (24 << 8))
+#define MAP_PETALBURG_WOODS (11 | (24 << 8))
+#define MAP_MT_CHIMNEY (12 | (24 << 8))
+#define MAP_JAGGED_PASS (13 | (24 << 8))
+#define MAP_FIERY_PATH (14 | (24 << 8))
+#define MAP_MT_PYRE_1F (15 | (24 << 8))
+#define MAP_MT_PYRE_2F (16 | (24 << 8))
+#define MAP_MT_PYRE_3F (17 | (24 << 8))
+#define MAP_MT_PYRE_4F (18 | (24 << 8))
+#define MAP_MT_PYRE_5F (19 | (24 << 8))
+#define MAP_MT_PYRE_6F (20 | (24 << 8))
+#define MAP_MT_PYRE_EXTERIOR (21 | (24 << 8))
+#define MAP_MT_PYRE_SUMMIT (22 | (24 << 8))
+#define MAP_AQUA_HIDEOUT_1F (23 | (24 << 8))
+#define MAP_AQUA_HIDEOUT_B1F (24 | (24 << 8))
+#define MAP_AQUA_HIDEOUT_B2F (25 | (24 << 8))
+#define MAP_UNDERWATER_SEAFLOOR_CAVERN (26 | (24 << 8))
+#define MAP_SEAFLOOR_CAVERN_ENTRANCE (27 | (24 << 8))
+#define MAP_SEAFLOOR_CAVERN_ROOM1 (28 | (24 << 8))
+#define MAP_SEAFLOOR_CAVERN_ROOM2 (29 | (24 << 8))
+#define MAP_SEAFLOOR_CAVERN_ROOM3 (30 | (24 << 8))
+#define MAP_SEAFLOOR_CAVERN_ROOM4 (31 | (24 << 8))
+#define MAP_SEAFLOOR_CAVERN_ROOM5 (32 | (24 << 8))
+#define MAP_SEAFLOOR_CAVERN_ROOM6 (33 | (24 << 8))
+#define MAP_SEAFLOOR_CAVERN_ROOM7 (34 | (24 << 8))
+#define MAP_SEAFLOOR_CAVERN_ROOM8 (35 | (24 << 8))
+#define MAP_SEAFLOOR_CAVERN_ROOM9 (36 | (24 << 8))
+#define MAP_CAVE_OF_ORIGIN_ENTRANCE (37 | (24 << 8))
+#define MAP_CAVE_OF_ORIGIN_1F (38 | (24 << 8))
+#define MAP_CAVE_OF_ORIGIN_B1F (39 | (24 << 8))
+#define MAP_CAVE_OF_ORIGIN_B2F (40 | (24 << 8))
+#define MAP_CAVE_OF_ORIGIN_B3F (41 | (24 << 8))
+#define MAP_CAVE_OF_ORIGIN_B4F (42 | (24 << 8))
+#define MAP_VICTORY_ROAD_1F (43 | (24 << 8))
+#define MAP_VICTORY_ROAD_B1F (44 | (24 << 8))
+#define MAP_VICTORY_ROAD_B2F (45 | (24 << 8))
+#define MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM (46 | (24 << 8))
+#define MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM (47 | (24 << 8))
+#define MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM (48 | (24 << 8))
+#define MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM (49 | (24 << 8))
+#define MAP_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM (50 | (24 << 8))
+#define MAP_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM (51 | (24 << 8))
+#define MAP_NEW_MAUVILLE_ENTRANCE (52 | (24 << 8))
+#define MAP_NEW_MAUVILLE_INSIDE (53 | (24 << 8))
+#define MAP_ABANDONED_SHIP_DECK (54 | (24 << 8))
+#define MAP_ABANDONED_SHIP_CORRIDORS_1F (55 | (24 << 8))
+#define MAP_ABANDONED_SHIP_ROOMS_1F (56 | (24 << 8))
+#define MAP_ABANDONED_SHIP_CORRIDORS_B1F (57 | (24 << 8))
+#define MAP_ABANDONED_SHIP_ROOMS_B1F (58 | (24 << 8))
+#define MAP_ABANDONED_SHIP_ROOMS2_B1F (59 | (24 << 8))
+#define MAP_ABANDONED_SHIP_UNDERWATER1 (60 | (24 << 8))
+#define MAP_ABANDONED_SHIP_ROOM_B1F (61 | (24 << 8))
+#define MAP_ABANDONED_SHIP_ROOMS2_1F (62 | (24 << 8))
+#define MAP_ABANDONED_SHIP_CAPTAINS_OFFICE (63 | (24 << 8))
+#define MAP_ABANDONED_SHIP_UNDERWATER2 (64 | (24 << 8))
+#define MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS (65 | (24 << 8))
+#define MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS (66 | (24 << 8))
+#define MAP_ISLAND_CAVE (67 | (24 << 8))
+#define MAP_ANCIENT_TOMB (68 | (24 << 8))
+#define MAP_UNDERWATER_ROUTE134 (69 | (24 << 8))
+#define MAP_UNDERWATER_SEALED_CHAMBER (70 | (24 << 8))
+#define MAP_SEALED_CHAMBER_OUTER_ROOM (71 | (24 << 8))
+#define MAP_SEALED_CHAMBER_INNER_ROOM (72 | (24 << 8))
+#define MAP_SCORCHED_SLAB (73 | (24 << 8))
+#define MAP_MAGMA_HIDEOUT_1F (74 | (24 << 8))
+#define MAP_MAGMA_HIDEOUT_B1F (75 | (24 << 8))
+#define MAP_MAGMA_HIDEOUT_B2F (76 | (24 << 8))
+#define MAP_SKY_PILLAR_ENTRANCE (77 | (24 << 8))
+#define MAP_SKY_PILLAR_OUTSIDE (78 | (24 << 8))
+#define MAP_SKY_PILLAR_1F (79 | (24 << 8))
+#define MAP_SKY_PILLAR_2F (80 | (24 << 8))
+#define MAP_SKY_PILLAR_3F (81 | (24 << 8))
+#define MAP_SKY_PILLAR_4F (82 | (24 << 8))
+#define MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM (83 | (24 << 8))
+#define MAP_SKY_PILLAR_5F (84 | (24 << 8))
+#define MAP_SKY_PILLAR_TOP (85 | (24 << 8))
+
+// Map Group 25
+#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))
+#define MAP_SECRET_BASE_YELLOW_CAVE1 (3 | (25 << 8))
+#define MAP_SECRET_BASE_TREE1 (4 | (25 << 8))
+#define MAP_SECRET_BASE_SHRUB1 (5 | (25 << 8))
+#define MAP_SECRET_BASE_RED_CAVE2 (6 | (25 << 8))
+#define MAP_SECRET_BASE_BROWN_CAVE2 (7 | (25 << 8))
+#define MAP_SECRET_BASE_BLUE_CAVE2 (8 | (25 << 8))
+#define MAP_SECRET_BASE_YELLOW_CAVE2 (9 | (25 << 8))
+#define MAP_SECRET_BASE_TREE2 (10 | (25 << 8))
+#define MAP_SECRET_BASE_SHRUB2 (11 | (25 << 8))
+#define MAP_SECRET_BASE_RED_CAVE3 (12 | (25 << 8))
+#define MAP_SECRET_BASE_BROWN_CAVE3 (13 | (25 << 8))
+#define MAP_SECRET_BASE_BLUE_CAVE3 (14 | (25 << 8))
+#define MAP_SECRET_BASE_YELLOW_CAVE3 (15 | (25 << 8))
+#define MAP_SECRET_BASE_TREE3 (16 | (25 << 8))
+#define MAP_SECRET_BASE_SHRUB3 (17 | (25 << 8))
+#define MAP_SECRET_BASE_RED_CAVE4 (18 | (25 << 8))
+#define MAP_SECRET_BASE_BROWN_CAVE4 (19 | (25 << 8))
+#define MAP_SECRET_BASE_BLUE_CAVE4 (20 | (25 << 8))
+#define MAP_SECRET_BASE_YELLOW_CAVE4 (21 | (25 << 8))
+#define MAP_SECRET_BASE_TREE4 (22 | (25 << 8))
+#define MAP_SECRET_BASE_SHRUB4 (23 | (25 << 8))
+#define MAP_SINGLE_BATTLE_COLOSSEUM (24 | (25 << 8))
+#define MAP_TRADE_CENTER (25 | (25 << 8))
+#define MAP_RECORD_CORNER (26 | (25 << 8))
+#define MAP_DOUBLE_BATTLE_COLOSSEUM (27 | (25 << 8))
+#define MAP_LINK_CONTEST_ROOM1 (28 | (25 << 8))
+#define MAP_UNKNOWN_MAP_25_29 (29 | (25 << 8))
+#define MAP_UNKNOWN_MAP_25_30 (30 | (25 << 8))
+#define MAP_UNKNOWN_MAP_25_31 (31 | (25 << 8))
+#define MAP_UNKNOWN_MAP_25_32 (32 | (25 << 8))
+#define MAP_UNKNOWN_MAP_25_33 (33 | (25 << 8))
+#define MAP_UNKNOWN_MAP_25_34 (34 | (25 << 8))
+#define MAP_LINK_CONTEST_ROOM2 (35 | (25 << 8))
+#define MAP_LINK_CONTEST_ROOM3 (36 | (25 << 8))
+#define MAP_LINK_CONTEST_ROOM4 (37 | (25 << 8))
+#define MAP_LINK_CONTEST_ROOM5 (38 | (25 << 8))
+#define MAP_LINK_CONTEST_ROOM6 (39 | (25 << 8))
+#define MAP_INSIDE_OF_TRUCK (40 | (25 << 8))
+#define MAP_SS_TIDAL_CORRIDOR (41 | (25 << 8))
+#define MAP_SS_TIDAL_LOWER_DECK (42 | (25 << 8))
+#define MAP_SS_TIDAL_ROOMS (43 | (25 << 8))
+
+// Map Group 26
+#define MAP_SAFARI_ZONE_NORTHWEST (0 | (26 << 8))
+#define MAP_SAFARI_ZONE_NORTHEAST (1 | (26 << 8))
+#define MAP_SAFARI_ZONE_SOUTHWEST (2 | (26 << 8))
+#define MAP_SAFARI_ZONE_SOUTHEAST (3 | (26 << 8))
+#define MAP_BATTLE_TOWER_OUTSIDE (4 | (26 << 8))
+#define MAP_BATTLE_TOWER_LOBBY (5 | (26 << 8))
+#define MAP_BATTLE_TOWER_ELEVATOR (6 | (26 << 8))
+#define MAP_BATTLE_TOWER_CORRIDOR (7 | (26 << 8))
+#define MAP_BATTLE_TOWER_BATTLE_ROOM (8 | (26 << 8))
+#define MAP_SOUTHERN_ISLAND_EXTERIOR (9 | (26 << 8))
+#define MAP_SOUTHERN_ISLAND_INTERIOR (10 | (26 << 8))
+#define MAP_SAFARI_ZONE_REST_HOUSE (11 | (26 << 8))
+
+// Map Group 27
+#define MAP_ROUTE104_PROTOTYPE (0 | (27 << 8))
+#define MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP (1 | (27 << 8))
+
+// Map Group 28
+#define MAP_ROUTE109_SEASHORE_HOUSE (0 | (28 << 8))
+
+// Map Group 29
+#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))
+#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 (3 | (29 << 8))
+#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE2 (4 | (29 << 8))
+#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE3 (5 | (29 << 8))
+#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE4 (6 | (29 << 8))
+#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE5 (7 | (29 << 8))
+#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE6 (8 | (29 << 8))
+#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 (9 | (29 << 8))
+#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE8 (10 | (29 << 8))
+#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
+#define MAP_ROUTE113_GLASS_WORKSHOP (0 | (30 << 8))
+
+// Map Group 31
+#define MAP_ROUTE123_BERRY_MASTERS_HOUSE (0 | (31 << 8))
+
+// Map Group 32
+#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
+#define MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE (0 | (33 << 8))
+
+#define MAP_GROUPS_COUNT 34
+
+#endif // GUARD_CONSTANTS_MAP_GROUPS_H
diff --git a/include/constants/maps.h b/include/constants/maps.h
index f96591f60..e1e2da992 100644
--- a/include/constants/maps.h
+++ b/include/constants/maps.h
@@ -1,473 +1,11 @@
#ifndef GUARD_CONSTANTS_MAPS_H
#define GUARD_CONSTANTS_MAPS_H
-// Map Group 0
-#define MAP_PETALBURG_CITY (0 | (0 << 8))
-#define MAP_SLATEPORT_CITY (1 | (0 << 8))
-#define MAP_MAUVILLE_CITY (2 | (0 << 8))
-#define MAP_RUSTBORO_CITY (3 | (0 << 8))
-#define MAP_FORTREE_CITY (4 | (0 << 8))
-#define MAP_LILYCOVE_CITY (5 | (0 << 8))
-#define MAP_MOSSDEEP_CITY (6 | (0 << 8))
-#define MAP_SOOTOPOLIS_CITY (7 | (0 << 8))
-#define MAP_EVER_GRANDE_CITY (8 | (0 << 8))
-#define MAP_LITTLEROOT_TOWN (9 | (0 << 8))
-#define MAP_OLDALE_TOWN (10 | (0 << 8))
-#define MAP_DEWFORD_TOWN (11 | (0 << 8))
-#define MAP_LAVARIDGE_TOWN (12 | (0 << 8))
-#define MAP_FALLARBOR_TOWN (13 | (0 << 8))
-#define MAP_VERDANTURF_TOWN (14 | (0 << 8))
-#define MAP_PACIFIDLOG_TOWN (15 | (0 << 8))
-#define MAP_ROUTE101 (16 | (0 << 8))
-#define MAP_ROUTE102 (17 | (0 << 8))
-#define MAP_ROUTE103 (18 | (0 << 8))
-#define MAP_ROUTE104 (19 | (0 << 8))
-#define MAP_ROUTE105 (20 | (0 << 8))
-#define MAP_ROUTE106 (21 | (0 << 8))
-#define MAP_ROUTE107 (22 | (0 << 8))
-#define MAP_ROUTE108 (23 | (0 << 8))
-#define MAP_ROUTE109 (24 | (0 << 8))
-#define MAP_ROUTE110 (25 | (0 << 8))
-#define MAP_ROUTE111 (26 | (0 << 8))
-#define MAP_ROUTE112 (27 | (0 << 8))
-#define MAP_ROUTE113 (28 | (0 << 8))
-#define MAP_ROUTE114 (29 | (0 << 8))
-#define MAP_ROUTE115 (30 | (0 << 8))
-#define MAP_ROUTE116 (31 | (0 << 8))
-#define MAP_ROUTE117 (32 | (0 << 8))
-#define MAP_ROUTE118 (33 | (0 << 8))
-#define MAP_ROUTE119 (34 | (0 << 8))
-#define MAP_ROUTE120 (35 | (0 << 8))
-#define MAP_ROUTE121 (36 | (0 << 8))
-#define MAP_ROUTE122 (37 | (0 << 8))
-#define MAP_ROUTE123 (38 | (0 << 8))
-#define MAP_ROUTE124 (39 | (0 << 8))
-#define MAP_ROUTE125 (40 | (0 << 8))
-#define MAP_ROUTE126 (41 | (0 << 8))
-#define MAP_ROUTE127 (42 | (0 << 8))
-#define MAP_ROUTE128 (43 | (0 << 8))
-#define MAP_ROUTE129 (44 | (0 << 8))
-#define MAP_ROUTE130 (45 | (0 << 8))
-#define MAP_ROUTE131 (46 | (0 << 8))
-#define MAP_ROUTE132 (47 | (0 << 8))
-#define MAP_ROUTE133 (48 | (0 << 8))
-#define MAP_ROUTE134 (49 | (0 << 8))
-#define MAP_UNDERWATER1 (50 | (0 << 8))
-#define MAP_UNDERWATER2 (51 | (0 << 8))
-#define MAP_UNDERWATER3 (52 | (0 << 8))
-#define MAP_UNDERWATER4 (53 | (0 << 8))
-
-// Map Group 1
-#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
-#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
-#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))
-#define MAP_DEWFORD_TOWN_GYM (3 | (3 << 8))
-#define MAP_DEWFORD_TOWN_HALL (4 | (3 << 8))
-#define MAP_DEWFORD_TOWN_HOUSE2 (5 | (3 << 8))
-
-// Map Group 4
-#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))
-#define MAP_LAVARIDGE_TOWN_HOUSE (3 | (4 << 8))
-#define MAP_LAVARIDGE_TOWN_MART (4 | (4 << 8))
-#define MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F (5 | (4 << 8))
-#define MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F (6 | (4 << 8))
-
-// Map Group 5
-#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))
-#define MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F (3 | (5 << 8))
-#define MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F (4 | (5 << 8))
-#define MAP_FALLARBOR_TOWN_HOUSE1 (5 | (5 << 8))
-#define MAP_FALLARBOR_TOWN_HOUSE2 (6 | (5 << 8))
-
-// Map Group 6
-#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))
-#define MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F (3 | (6 << 8))
-#define MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F (4 | (6 << 8))
-#define MAP_VERDANTURF_TOWN_WANDAS_HOUSE (5 | (6 << 8))
-#define MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE (6 | (6 << 8))
-#define MAP_VERDANTURF_TOWN_HOUSE (7 | (6 << 8))
-
-// Map Group 7
-#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))
-#define MAP_PACIFIDLOG_TOWN_HOUSE2 (3 | (7 << 8))
-#define MAP_PACIFIDLOG_TOWN_HOUSE3 (4 | (7 << 8))
-#define MAP_PACIFIDLOG_TOWN_HOUSE4 (5 | (7 << 8))
-#define MAP_PACIFIDLOG_TOWN_HOUSE5 (6 | (7 << 8))
-
-// Map Group 8
-#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))
-#define MAP_PETALBURG_CITY_HOUSE2 (3 | (8 << 8))
-#define MAP_PETALBURG_CITY_POKEMON_CENTER_1F (4 | (8 << 8))
-#define MAP_PETALBURG_CITY_POKEMON_CENTER_2F (5 | (8 << 8))
-#define MAP_PETALBURG_CITY_MART (6 | (8 << 8))
-
-// Map Group 9
-#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))
-#define MAP_SLATEPORT_CITY_CONTEST_HALL (3 | (9 << 8))
-#define MAP_SLATEPORT_CITY_HOUSE1 (4 | (9 << 8))
-#define MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB (5 | (9 << 8))
-#define MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F (6 | (9 << 8))
-#define MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F (7 | (9 << 8))
-#define MAP_SLATEPORT_CITY_HARBOR (8 | (9 << 8))
-#define MAP_SLATEPORT_CITY_HOUSE2 (9 | (9 << 8))
-#define MAP_SLATEPORT_CITY_POKEMON_CENTER_1F (10 | (9 << 8))
-#define MAP_SLATEPORT_CITY_POKEMON_CENTER_2F (11 | (9 << 8))
-#define MAP_SLATEPORT_CITY_MART (12 | (9 << 8))
-
-// Map Group 10
-#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))
-#define MAP_MAUVILLE_CITY_GAME_CORNER (3 | (10 << 8))
-#define MAP_MAUVILLE_CITY_HOUSE2 (4 | (10 << 8))
-#define MAP_MAUVILLE_CITY_POKEMON_CENTER_1F (5 | (10 << 8))
-#define MAP_MAUVILLE_CITY_POKEMON_CENTER_2F (6 | (10 << 8))
-#define MAP_MAUVILLE_CITY_MART (7 | (10 << 8))
-
-// Map Group 11
-#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))
-#define MAP_RUSTBORO_CITY_GYM (3 | (11 << 8))
-#define MAP_RUSTBORO_CITY_POKEMON_SCHOOL (4 | (11 << 8))
-#define MAP_RUSTBORO_CITY_POKEMON_CENTER_1F (5 | (11 << 8))
-#define MAP_RUSTBORO_CITY_POKEMON_CENTER_2F (6 | (11 << 8))
-#define MAP_RUSTBORO_CITY_MART (7 | (11 << 8))
-#define MAP_RUSTBORO_CITY_FLAT1_1F (8 | (11 << 8))
-#define MAP_RUSTBORO_CITY_FLAT1_2F (9 | (11 << 8))
-#define MAP_RUSTBORO_CITY_HOUSE1 (10 | (11 << 8))
-#define MAP_RUSTBORO_CITY_CUTTERS_HOUSE (11 | (11 << 8))
-#define MAP_RUSTBORO_CITY_HOUSE2 (12 | (11 << 8))
-#define MAP_RUSTBORO_CITY_FLAT2_1F (13 | (11 << 8))
-#define MAP_RUSTBORO_CITY_FLAT2_2F (14 | (11 << 8))
-#define MAP_RUSTBORO_CITY_FLAT2_3F (15 | (11 << 8))
-#define MAP_RUSTBORO_CITY_HOUSE3 (16 | (11 << 8))
-
-// Map Group 12
-#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))
-#define MAP_FORTREE_CITY_POKEMON_CENTER_2F (3 | (12 << 8))
-#define MAP_FORTREE_CITY_MART (4 | (12 << 8))
-#define MAP_FORTREE_CITY_HOUSE2 (5 | (12 << 8))
-#define MAP_FORTREE_CITY_HOUSE3 (6 | (12 << 8))
-#define MAP_FORTREE_CITY_HOUSE4 (7 | (12 << 8))
-#define MAP_FORTREE_CITY_HOUSE5 (8 | (12 << 8))
-#define MAP_FORTREE_CITY_DECORATION_SHOP (9 | (12 << 8))
-
-// Map Group 13
-#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))
-#define MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F (3 | (13 << 8))
-#define MAP_LILYCOVE_CITY_CONTEST_LOBBY (4 | (13 << 8))
-#define MAP_LILYCOVE_CITY_CONTEST_HALL (5 | (13 << 8))
-#define MAP_LILYCOVE_CITY_POKEMON_CENTER_1F (6 | (13 << 8))
-#define MAP_LILYCOVE_CITY_POKEMON_CENTER_2F (7 | (13 << 8))
-#define MAP_LILYCOVE_CITY_UNUSED_MART (8 | (13 << 8))
-#define MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB (9 | (13 << 8))
-#define MAP_LILYCOVE_CITY_HARBOR (10 | (13 << 8))
-#define MAP_LILYCOVE_CITY_EMPTY_MAP (11 | (13 << 8))
-#define MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE (12 | (13 << 8))
-#define MAP_LILYCOVE_CITY_HOUSE1 (13 | (13 << 8))
-#define MAP_LILYCOVE_CITY_HOUSE2 (14 | (13 << 8))
-#define MAP_LILYCOVE_CITY_HOUSE3 (15 | (13 << 8))
-#define MAP_LILYCOVE_CITY_HOUSE4 (16 | (13 << 8))
-#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F (17 | (13 << 8))
-#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F (18 | (13 << 8))
-#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F (19 | (13 << 8))
-#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F (20 | (13 << 8))
-#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F (21 | (13 << 8))
-#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP (22 | (13 << 8))
-#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR (23 | (13 << 8))
-
-// Map Group 14
-#define MAP_MOSSDEEP_CITY_GYM (0 | (14 << 8))
-#define MAP_MOSSDEEP_CITY_HOUSE1 (1 | (14 << 8))
-#define MAP_MOSSDEEP_CITY_HOUSE2 (2 | (14 << 8))
-#define MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F (3 | (14 << 8))
-#define MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F (4 | (14 << 8))
-#define MAP_MOSSDEEP_CITY_MART (5 | (14 << 8))
-#define MAP_MOSSDEEP_CITY_HOUSE3 (6 | (14 << 8))
-#define MAP_MOSSDEEP_CITY_STEVENS_HOUSE (7 | (14 << 8))
-#define MAP_MOSSDEEP_CITY_HOUSE4 (8 | (14 << 8))
-#define MAP_MOSSDEEP_CITY_SPACE_CENTER_1F (9 | (14 << 8))
-#define MAP_MOSSDEEP_CITY_SPACE_CENTER_2F (10 | (14 << 8))
-#define MAP_MOSSDEEP_CITY_GAME_CORNER_1F (11 | (14 << 8))
-#define MAP_MOSSDEEP_CITY_GAME_CORNER_B1F (12 | (14 << 8))
-
-// Map Group 15
-#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))
-#define MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F (3 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_MART (4 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_HOUSE1 (5 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_HOUSE2 (6 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_HOUSE3 (7 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_HOUSE4 (8 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_HOUSE5 (9 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_HOUSE6 (10 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_HOUSE7 (11 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_HOUSE8 (12 | (15 << 8))
-
-// Map Group 16
-#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))
-#define MAP_EVER_GRANDE_CITY_DRAKES_ROOM (3 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM (4 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_CORRIDOR1 (5 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_CORRIDOR2 (6 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_CORRIDOR3 (7 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_CORRIDOR4 (8 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_CORRIDOR5 (9 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE (10 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_HALL_OF_FAME (11 | (16 << 8))
-#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
-#define MAP_ROUTE104_MR_BRINEYS_HOUSE (0 | (17 << 8))
-#define MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP (1 | (17 << 8))
-
-// Map Group 18
-#define MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE (0 | (18 << 8))
-#define MAP_ROUTE111_OLD_LADYS_REST_STOP (1 | (18 << 8))
-
-// Map Group 19
-#define MAP_ROUTE112_CABLE_CAR_STATION (0 | (19 << 8))
-#define MAP_MT_CHIMNEY_CABLE_CAR_STATION (1 | (19 << 8))
-
-// Map Group 20
-#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
-#define MAP_ROUTE116_TUNNELERS_REST_HOUSE (0 | (21 << 8))
-
-// Map Group 22
-#define MAP_ROUTE117_POKEMON_DAY_CARE (0 | (22 << 8))
-
-// Map Group 23
-#define MAP_ROUTE121_SAFARI_ZONE_ENTRANCE (0 | (23 << 8))
-
-// Map Group 24
-#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))
-#define MAP_METEOR_FALLS_B1F_2R (3 | (24 << 8))
-#define MAP_RUSTURF_TUNNEL (4 | (24 << 8))
-#define MAP_UNDERWATER_SOOTOPOLIS_CITY (5 | (24 << 8))
-#define MAP_DESERT_RUINS (6 | (24 << 8))
-#define MAP_GRANITE_CAVE_1F (7 | (24 << 8))
-#define MAP_GRANITE_CAVE_B1F (8 | (24 << 8))
-#define MAP_GRANITE_CAVE_B2F (9 | (24 << 8))
-#define MAP_GRANITE_CAVE_STEVENS_ROOM (10 | (24 << 8))
-#define MAP_PETALBURG_WOODS (11 | (24 << 8))
-#define MAP_MT_CHIMNEY (12 | (24 << 8))
-#define MAP_JAGGED_PASS (13 | (24 << 8))
-#define MAP_FIERY_PATH (14 | (24 << 8))
-#define MAP_MT_PYRE_1F (15 | (24 << 8))
-#define MAP_MT_PYRE_2F (16 | (24 << 8))
-#define MAP_MT_PYRE_3F (17 | (24 << 8))
-#define MAP_MT_PYRE_4F (18 | (24 << 8))
-#define MAP_MT_PYRE_5F (19 | (24 << 8))
-#define MAP_MT_PYRE_6F (20 | (24 << 8))
-#define MAP_MT_PYRE_EXTERIOR (21 | (24 << 8))
-#define MAP_MT_PYRE_SUMMIT (22 | (24 << 8))
-#define MAP_AQUA_HIDEOUT_1F (23 | (24 << 8))
-#define MAP_AQUA_HIDEOUT_B1F (24 | (24 << 8))
-#define MAP_AQUA_HIDEOUT_B2F (25 | (24 << 8))
-#define MAP_UNDERWATER_SEAFLOOR_CAVERN (26 | (24 << 8))
-#define MAP_SEAFLOOR_CAVERN_ENTRANCE (27 | (24 << 8))
-#define MAP_SEAFLOOR_CAVERN_ROOM1 (28 | (24 << 8))
-#define MAP_SEAFLOOR_CAVERN_ROOM2 (29 | (24 << 8))
-#define MAP_SEAFLOOR_CAVERN_ROOM3 (30 | (24 << 8))
-#define MAP_SEAFLOOR_CAVERN_ROOM4 (31 | (24 << 8))
-#define MAP_SEAFLOOR_CAVERN_ROOM5 (32 | (24 << 8))
-#define MAP_SEAFLOOR_CAVERN_ROOM6 (33 | (24 << 8))
-#define MAP_SEAFLOOR_CAVERN_ROOM7 (34 | (24 << 8))
-#define MAP_SEAFLOOR_CAVERN_ROOM8 (35 | (24 << 8))
-#define MAP_SEAFLOOR_CAVERN_ROOM9 (36 | (24 << 8))
-#define MAP_CAVE_OF_ORIGIN_ENTRANCE (37 | (24 << 8))
-#define MAP_CAVE_OF_ORIGIN_1F (38 | (24 << 8))
-#define MAP_CAVE_OF_ORIGIN_B1F (39 | (24 << 8))
-#define MAP_CAVE_OF_ORIGIN_B2F (40 | (24 << 8))
-#define MAP_CAVE_OF_ORIGIN_B3F (41 | (24 << 8))
-#define MAP_CAVE_OF_ORIGIN_B4F (42 | (24 << 8))
-#define MAP_VICTORY_ROAD_1F (43 | (24 << 8))
-#define MAP_VICTORY_ROAD_B1F (44 | (24 << 8))
-#define MAP_VICTORY_ROAD_B2F (45 | (24 << 8))
-#define MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM (46 | (24 << 8))
-#define MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM (47 | (24 << 8))
-#define MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM (48 | (24 << 8))
-#define MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM (49 | (24 << 8))
-#define MAP_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM (50 | (24 << 8))
-#define MAP_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM (51 | (24 << 8))
-#define MAP_NEW_MAUVILLE_ENTRANCE (52 | (24 << 8))
-#define MAP_NEW_MAUVILLE_INSIDE (53 | (24 << 8))
-#define MAP_ABANDONED_SHIP_DECK (54 | (24 << 8))
-#define MAP_ABANDONED_SHIP_CORRIDORS_1F (55 | (24 << 8))
-#define MAP_ABANDONED_SHIP_ROOMS_1F (56 | (24 << 8))
-#define MAP_ABANDONED_SHIP_CORRIDORS_B1F (57 | (24 << 8))
-#define MAP_ABANDONED_SHIP_ROOMS_B1F (58 | (24 << 8))
-#define MAP_ABANDONED_SHIP_ROOMS2_B1F (59 | (24 << 8))
-#define MAP_ABANDONED_SHIP_UNDERWATER1 (60 | (24 << 8))
-#define MAP_ABANDONED_SHIP_ROOM_B1F (61 | (24 << 8))
-#define MAP_ABANDONED_SHIP_ROOMS2_1F (62 | (24 << 8))
-#define MAP_ABANDONED_SHIP_CAPTAINS_OFFICE (63 | (24 << 8))
-#define MAP_ABANDONED_SHIP_UNDERWATER2 (64 | (24 << 8))
-#define MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS (65 | (24 << 8))
-#define MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS (66 | (24 << 8))
-#define MAP_ISLAND_CAVE (67 | (24 << 8))
-#define MAP_ANCIENT_TOMB (68 | (24 << 8))
-#define MAP_UNDERWATER_ROUTE134 (69 | (24 << 8))
-#define MAP_UNDERWATER_SEALED_CHAMBER (70 | (24 << 8))
-#define MAP_SEALED_CHAMBER_OUTER_ROOM (71 | (24 << 8))
-#define MAP_SEALED_CHAMBER_INNER_ROOM (72 | (24 << 8))
-#define MAP_SCORCHED_SLAB (73 | (24 << 8))
-#define MAP_MAGMA_HIDEOUT_1F (74 | (24 << 8))
-#define MAP_MAGMA_HIDEOUT_B1F (75 | (24 << 8))
-#define MAP_MAGMA_HIDEOUT_B2F (76 | (24 << 8))
-#define MAP_SKY_PILLAR_ENTRANCE (77 | (24 << 8))
-#define MAP_SKY_PILLAR_OUTSIDE (78 | (24 << 8))
-#define MAP_SKY_PILLAR_1F (79 | (24 << 8))
-#define MAP_SKY_PILLAR_2F (80 | (24 << 8))
-#define MAP_SKY_PILLAR_3F (81 | (24 << 8))
-#define MAP_SKY_PILLAR_4F (82 | (24 << 8))
-#define MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM (83 | (24 << 8))
-#define MAP_SKY_PILLAR_5F (84 | (24 << 8))
-#define MAP_SKY_PILLAR_TOP (85 | (24 << 8))
-
-// Map Group 25
-#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))
-#define MAP_SECRET_BASE_YELLOW_CAVE1 (3 | (25 << 8))
-#define MAP_SECRET_BASE_TREE1 (4 | (25 << 8))
-#define MAP_SECRET_BASE_SHRUB1 (5 | (25 << 8))
-#define MAP_SECRET_BASE_RED_CAVE2 (6 | (25 << 8))
-#define MAP_SECRET_BASE_BROWN_CAVE2 (7 | (25 << 8))
-#define MAP_SECRET_BASE_BLUE_CAVE2 (8 | (25 << 8))
-#define MAP_SECRET_BASE_YELLOW_CAVE2 (9 | (25 << 8))
-#define MAP_SECRET_BASE_TREE2 (10 | (25 << 8))
-#define MAP_SECRET_BASE_SHRUB2 (11 | (25 << 8))
-#define MAP_SECRET_BASE_RED_CAVE3 (12 | (25 << 8))
-#define MAP_SECRET_BASE_BROWN_CAVE3 (13 | (25 << 8))
-#define MAP_SECRET_BASE_BLUE_CAVE3 (14 | (25 << 8))
-#define MAP_SECRET_BASE_YELLOW_CAVE3 (15 | (25 << 8))
-#define MAP_SECRET_BASE_TREE3 (16 | (25 << 8))
-#define MAP_SECRET_BASE_SHRUB3 (17 | (25 << 8))
-#define MAP_SECRET_BASE_RED_CAVE4 (18 | (25 << 8))
-#define MAP_SECRET_BASE_BROWN_CAVE4 (19 | (25 << 8))
-#define MAP_SECRET_BASE_BLUE_CAVE4 (20 | (25 << 8))
-#define MAP_SECRET_BASE_YELLOW_CAVE4 (21 | (25 << 8))
-#define MAP_SECRET_BASE_TREE4 (22 | (25 << 8))
-#define MAP_SECRET_BASE_SHRUB4 (23 | (25 << 8))
-#define MAP_SINGLE_BATTLE_COLOSSEUM (24 | (25 << 8))
-#define MAP_TRADE_CENTER (25 | (25 << 8))
-#define MAP_RECORD_CORNER (26 | (25 << 8))
-#define MAP_DOUBLE_BATTLE_COLOSSEUM (27 | (25 << 8))
-#define MAP_LINK_CONTEST_ROOM1 (28 | (25 << 8))
-#define MAP_UNKNOWN_MAP_25_29 (29 | (25 << 8))
-#define MAP_UNKNOWN_MAP_25_30 (30 | (25 << 8))
-#define MAP_UNKNOWN_MAP_25_31 (31 | (25 << 8))
-#define MAP_UNKNOWN_MAP_25_32 (32 | (25 << 8))
-#define MAP_UNKNOWN_MAP_25_33 (33 | (25 << 8))
-#define MAP_UNKNOWN_MAP_25_34 (34 | (25 << 8))
-#define MAP_LINK_CONTEST_ROOM2 (35 | (25 << 8))
-#define MAP_LINK_CONTEST_ROOM3 (36 | (25 << 8))
-#define MAP_LINK_CONTEST_ROOM4 (37 | (25 << 8))
-#define MAP_LINK_CONTEST_ROOM5 (38 | (25 << 8))
-#define MAP_LINK_CONTEST_ROOM6 (39 | (25 << 8))
-#define MAP_INSIDE_OF_TRUCK (40 | (25 << 8))
-#define MAP_SS_TIDAL_CORRIDOR (41 | (25 << 8))
-#define MAP_SS_TIDAL_LOWER_DECK (42 | (25 << 8))
-#define MAP_SS_TIDAL_ROOMS (43 | (25 << 8))
-
-// Map Group 26
-#define MAP_SAFARI_ZONE_NORTHWEST (0 | (26 << 8))
-#define MAP_SAFARI_ZONE_NORTHEAST (1 | (26 << 8))
-#define MAP_SAFARI_ZONE_SOUTHWEST (2 | (26 << 8))
-#define MAP_SAFARI_ZONE_SOUTHEAST (3 | (26 << 8))
-#define MAP_BATTLE_TOWER_OUTSIDE (4 | (26 << 8))
-#define MAP_BATTLE_TOWER_LOBBY (5 | (26 << 8))
-#define MAP_BATTLE_TOWER_ELEVATOR (6 | (26 << 8))
-#define MAP_BATTLE_TOWER_CORRIDOR (7 | (26 << 8))
-#define MAP_BATTLE_TOWER_BATTLE_ROOM (8 | (26 << 8))
-#define MAP_SOUTHERN_ISLAND_EXTERIOR (9 | (26 << 8))
-#define MAP_SOUTHERN_ISLAND_INTERIOR (10 | (26 << 8))
-#define MAP_SAFARI_ZONE_REST_HOUSE (11 | (26 << 8))
-
-// Map Group 27
-#define MAP_ROUTE104_PROTOTYPE (0 | (27 << 8))
-#define MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP (1 | (27 << 8))
-
-// Map Group 28
-#define MAP_ROUTE109_SEASHORE_HOUSE (0 | (28 << 8))
-
-// Map Group 29
-#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))
-#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 (3 | (29 << 8))
-#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE2 (4 | (29 << 8))
-#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE3 (5 | (29 << 8))
-#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE4 (6 | (29 << 8))
-#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE5 (7 | (29 << 8))
-#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE6 (8 | (29 << 8))
-#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 (9 | (29 << 8))
-#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE8 (10 | (29 << 8))
-#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
-#define MAP_ROUTE113_GLASS_WORKSHOP (0 | (30 << 8))
-
-// Map Group 31
-#define MAP_ROUTE123_BERRY_MASTERS_HOUSE (0 | (31 << 8))
-
-// Map Group 32
-#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
-#define MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE (0 | (33 << 8))
-
+#include "map_groups.h"
#define MAP_NONE (0x7F | (0x7F << 8))
#define MAP_UNDEFINED (0xFF | (0xFF << 8))
-
#define MAP_GROUP(map) (MAP_##map >> 8)
#define MAP_NUM(map) (MAP_##map & 0xFF)
diff --git a/include/constants/region_map_sections.h b/include/constants/region_map_sections.h
index 254ae2edd..4fd9aa894 100644
--- a/include/constants/region_map_sections.h
+++ b/include/constants/region_map_sections.h
@@ -89,6 +89,6 @@
#define MAPSEC_SKY_PILLAR 0x55
#define MAPSEC_SECRET_BASE 0x56
#define MAPSEC_DYNAMIC 0x57
-#define MAPSEC_NOTHING 0x58
+#define MAPSEC_NONE 0x58
#endif // GUARD_REGIONMAPSEC_H