Get all map constants from include/ rather than constants/

1 files changed, 67 insertions, 67 deletions

diff --git a/include/constants/maps.h b/include/constants/maps.h
index fb1cb82a8..f6096e1c5 100644
--- a/include/constants/maps.h
+++ b/include/constants/maps.h
@@ -228,21 +228,21 @@
 #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))
-#define MAP_SOOTOPOLIS_CITY_HOUSE9_1F         (13 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_HOUSE9_B1F        (14 | (15 << 8))
+#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_LOTAD_AND_SEEDOT_HOUSE   (12 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F  (13 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F (14 | (15 << 8))
 
 // Map Group 16
 #define MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM      (0 | (16 << 8))
@@ -442,29 +442,29 @@
 #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))
-#define MAP_BATTLE_PYRAMID_SQUARE_01 (44 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE_02 (45 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE_03 (46 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE_04 (47 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE_05 (48 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE_06 (49 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE_07 (50 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE_08 (51 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE_09 (52 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE_10 (53 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE_11 (54 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE_12 (55 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE_13 (56 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE_14 (57 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE_15 (58 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE_16 (59 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE01  (44 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE02  (45 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE03  (46 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE04  (47 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE05  (48 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE06  (49 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE07  (50 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE08  (51 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE09  (52 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE10  (53 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE11  (54 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE12  (55 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE13  (56 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE14  (57 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE15  (58 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE16  (59 | (25 << 8))
 #define MAP_UNION_ROOM               (60 | (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_NORTH        (1 | (26 << 8))
 #define MAP_SAFARI_ZONE_SOUTHWEST    (2 | (26 << 8))
-#define MAP_SAFARI_ZONE_SOUTHEAST    (3 | (26 << 8))
+#define MAP_SAFARI_ZONE_SOUTH        (3 | (26 << 8))
 #define MAP_BATTLE_FRONTIER_OUTSIDE_WEST     (4 | (26 << 8))
 #define MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY       (5 | (26 << 8))
 #define MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR    (6 | (26 << 8))
@@ -473,12 +473,12 @@
 #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))
-#define MAP_SAFARI_ZONE_EM_1 (12 | (26 << 8))
-#define MAP_SAFARI_ZONE_EM_2 (13 | (26 << 8))
+#define MAP_SAFARI_ZONE_NORTHEAST    (12 | (26 << 8))
+#define MAP_SAFARI_ZONE_SOUTHEAST    (13 | (26 << 8))
 #define MAP_BATTLE_FRONTIER_OUTSIDE_EAST                         (14 | (26 << 8))
 #define MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM       (15 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2              (16 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM_2           (17 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2               (16 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2            (17 | (26 << 8))
 #define MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY                    (18 | (26 << 8))
 #define MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR                 (19 | (26 << 8))
 #define MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM          (20 | (26 << 8))
@@ -498,22 +498,22 @@
 #define MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY                    (34 | (26 << 8))
 #define MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR                 (35 | (26 << 8))
 #define MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM          (36 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_1            (37 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_2            (38 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_3            (39 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1             (37 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2             (38 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3             (39 | (26 << 8))
 #define MAP_BATTLE_FRONTIER_RANKING_HALL                         (40 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE_1                             (41 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE1                              (41 | (26 << 8))
 #define MAP_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER (42 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE_2                             (43 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE_3                             (44 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE_4                             (45 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE2                              (43 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE3                              (44 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE4                              (45 | (26 << 8))
 #define MAP_BATTLE_FRONTIER_SCOTTS_HOUSE                         (46 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE_5                             (47 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE_6                             (48 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE_7                             (49 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE5                              (47 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE6                              (48 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE7                              (49 | (26 << 8))
 #define MAP_BATTLE_FRONTIER_RECEPTION_GATE                       (50 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE_8                             (51 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE_9                             (52 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE8                              (51 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE9                              (52 | (26 << 8))
 #define MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F                    (53 | (26 << 8))
 #define MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F                    (54 | (26 << 8))
 #define MAP_BATTLE_FRONTIER_MART                                 (55 | (26 << 8))
@@ -530,24 +530,24 @@
 #define MAP_NAVEL_ROCK_EXTERIOR (66 | (26 << 8))
 #define MAP_NAVEL_ROCK_HARBOR (67 | (26 << 8))
 #define MAP_NAVEL_ROCK_ENTRANCE (68 | (26 << 8))
-#define MAP_NAVEL_ROCK_B1F (69 | (26 << 8))
-#define MAP_NAVEL_ROCK_FORK (70 | (26 << 8))
-#define MAP_NAVEL_ROCK_UP_1 (71 | (26 << 8))
-#define MAP_NAVEL_ROCK_UP_2 (72 | (26 << 8))
-#define MAP_NAVEL_ROCK_UP_3 (73 | (26 << 8))
-#define MAP_NAVEL_ROCK_UP_4 (74 | (26 << 8))
-#define MAP_NAVEL_ROCK_TOP (75 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN_01 (76 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN_02 (77 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN_03 (78 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN_04 (79 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN_05 (80 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN_06 (81 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN_07 (82 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN_08 (83 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN_09 (84 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN_10 (85 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN_11 (86 | (26 << 8))
+#define MAP_NAVEL_ROCK_B1F    (69 | (26 << 8))
+#define MAP_NAVEL_ROCK_FORK   (70 | (26 << 8))
+#define MAP_NAVEL_ROCK_UP1    (71 | (26 << 8))
+#define MAP_NAVEL_ROCK_UP2    (72 | (26 << 8))
+#define MAP_NAVEL_ROCK_UP3    (73 | (26 << 8))
+#define MAP_NAVEL_ROCK_UP4    (74 | (26 << 8))
+#define MAP_NAVEL_ROCK_TOP    (75 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN01 (76 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN02 (77 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN03 (78 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN04 (79 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN05 (80 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN06 (81 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN07 (82 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN08 (83 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN09 (84 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN10 (85 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN11 (86 | (26 << 8))
 #define MAP_NAVEL_ROCK_BOTTOM (87 | (26 << 8))
 #define MAP_TRAINER_HILL_ELEVATOR (88 | (26 << 8))