1 files changed, 101 insertions, 101 deletions
diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h
index 6a3276b44..17fe7ab53 100755
--- a/include/constants/map_groups.h
+++ b/include/constants/map_groups.h
@@ -98,8 +98,8 @@
 #define MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM (3 | (5 << 8))
 #define MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F       (4 | (5 << 8))
 #define MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F       (5 | (5 << 8))
-#define MAP_FALLARBOR_TOWN_HOUSE1                  (6 | (5 << 8))
-#define MAP_FALLARBOR_TOWN_HOUSE2                  (7 | (5 << 8))
+#define MAP_FALLARBOR_TOWN_COZMOS_HOUSE            (6 | (5 << 8))
+#define MAP_FALLARBOR_TOWN_MOVE_RELEARNERS_HOUSE   (7 | (5 << 8))
 
 // Map Group 6
 #define MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY       (0 | (6 << 8))
@@ -136,12 +136,12 @@
 #define MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY       (2 | (9 << 8))
 #define MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR    (3 | (9 << 8))
 #define MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM (4 | (9 << 8))
-#define MAP_SLATEPORT_CITY_HOUSE1                  (5 | (9 << 8))
+#define MAP_SLATEPORT_CITY_NAME_RATERS_HOUSE       (5 | (9 << 8))
 #define MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB        (6 | (9 << 8))
 #define MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F       (7 | (9 << 8))
 #define MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F       (8 | (9 << 8))
 #define MAP_SLATEPORT_CITY_HARBOR                  (9 | (9 << 8))
-#define MAP_SLATEPORT_CITY_HOUSE2                  (10 | (9 << 8))
+#define MAP_SLATEPORT_CITY_HOUSE                   (10 | (9 << 8))
 #define MAP_SLATEPORT_CITY_POKEMON_CENTER_1F       (11 | (9 << 8))
 #define MAP_SLATEPORT_CITY_POKEMON_CENTER_2F       (12 | (9 << 8))
 #define MAP_SLATEPORT_CITY_MART                    (13 | (9 << 8))
@@ -422,22 +422,22 @@
 #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_BATTLE_COLOSSEUM_2P             (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_BATTLE_COLOSSEUM_4P             (27 | (25 << 8))
+#define MAP_CONTEST_HALL                    (28 | (25 << 8))
 #define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_29 (29 | (25 << 8))
 #define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_30 (30 | (25 << 8))
 #define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_31 (31 | (25 << 8))
 #define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_32 (32 | (25 << 8))
 #define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_33 (33 | (25 << 8))
 #define MAP_UNKNOWN_LINK_CONTEST_ROOM_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_CONTEST_HALL_BEAUTY             (35 | (25 << 8))
+#define MAP_CONTEST_HALL_TOUGH              (36 | (25 << 8))
+#define MAP_CONTEST_HALL_COOL               (37 | (25 << 8))
+#define MAP_CONTEST_HALL_SMART              (38 | (25 << 8))
+#define MAP_CONTEST_HALL_CUTE               (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))
@@ -461,95 +461,95 @@
 #define MAP_UNION_ROOM                      (60 | (25 << 8))
 
 // Map Group 26
-#define MAP_SAFARI_ZONE_NORTHWEST                                (0 | (26 << 8))
-#define MAP_SAFARI_ZONE_NORTH                                    (1 | (26 << 8))
-#define MAP_SAFARI_ZONE_SOUTHWEST                                (2 | (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))
-#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR                (7 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_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))
-#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_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))
-#define MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM              (21 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY                  (22 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR               (23 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM            (24 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY                 (25 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE          (26 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP                   (27 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY                   (28 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR                (29 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM             (30 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY                 (31 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM       (32 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM           (33 | (26 << 8))
-#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_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_LOUNGE1                              (41 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER (42 | (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_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_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))
-#define MAP_FARAWAY_ISLAND_ENTRANCE                              (56 | (26 << 8))
-#define MAP_FARAWAY_ISLAND_INTERIOR                              (57 | (26 << 8))
-#define MAP_BIRTH_ISLAND_EXTERIOR                                (58 | (26 << 8))
-#define MAP_BIRTH_ISLAND_HARBOR                                  (59 | (26 << 8))
-#define MAP_TRAINER_HILL_ENTRANCE                                (60 | (26 << 8))
-#define MAP_TRAINER_HILL_1F                                      (61 | (26 << 8))
-#define MAP_TRAINER_HILL_2F                                      (62 | (26 << 8))
-#define MAP_TRAINER_HILL_3F                                      (63 | (26 << 8))
-#define MAP_TRAINER_HILL_4F                                      (64 | (26 << 8))
-#define MAP_TRAINER_HILL_ROOF                                    (65 | (26 << 8))
-#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_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))
+#define MAP_SAFARI_ZONE_NORTHWEST                           (0 | (26 << 8))
+#define MAP_SAFARI_ZONE_NORTH                               (1 | (26 << 8))
+#define MAP_SAFARI_ZONE_SOUTHWEST                           (2 | (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))
+#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR           (7 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_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))
+#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_PARTNER_ROOM (15 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR     (16 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM  (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))
+#define MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM         (21 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY             (22 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR          (23 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM       (24 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY            (25 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR            (26 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP              (27 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY              (28 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR           (29 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM        (30 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY            (31 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM  (32 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM      (33 | (26 << 8))
+#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_ROOM_NORMAL         (37 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL          (38 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS      (39 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_RANKING_HALL                    (40 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE1                         (41 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER         (42 | (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_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_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))
+#define MAP_FARAWAY_ISLAND_ENTRANCE                         (56 | (26 << 8))
+#define MAP_FARAWAY_ISLAND_INTERIOR                         (57 | (26 << 8))
+#define MAP_BIRTH_ISLAND_EXTERIOR                           (58 | (26 << 8))
+#define MAP_BIRTH_ISLAND_HARBOR                             (59 | (26 << 8))
+#define MAP_TRAINER_HILL_ENTRANCE                           (60 | (26 << 8))
+#define MAP_TRAINER_HILL_1F                                 (61 | (26 << 8))
+#define MAP_TRAINER_HILL_2F                                 (62 | (26 << 8))
+#define MAP_TRAINER_HILL_3F                                 (63 | (26 << 8))
+#define MAP_TRAINER_HILL_4F                                 (64 | (26 << 8))
+#define MAP_TRAINER_HILL_ROOF                               (65 | (26 << 8))
+#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_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))
 
 // Map Group 27
 #define MAP_ROUTE104_PROTOTYPE                          (0 | (27 << 8))