1 files changed, 20 insertions, 20 deletions
diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h
index 0cc1c27fb..27e74b337 100644
--- a/include/constants/map_groups.h
+++ b/include/constants/map_groups.h
@@ -135,17 +135,17 @@
 
 // Map Group 2
 #define MAP_NAVEL_ROCK_EXTERIOR                       (0 | (2 << 8))
-#define MAP_SEVEN_ISLAND_TRAINER_TOWER_1F             (1 | (2 << 8))
-#define MAP_SEVEN_ISLAND_TRAINER_TOWER_2F             (2 | (2 << 8))
-#define MAP_SEVEN_ISLAND_TRAINER_TOWER_3F             (3 | (2 << 8))
-#define MAP_SEVEN_ISLAND_TRAINER_TOWER_4F             (4 | (2 << 8))
-#define MAP_SEVEN_ISLAND_TRAINER_TOWER_5F             (5 | (2 << 8))
-#define MAP_SEVEN_ISLAND_TRAINER_TOWER_6F             (6 | (2 << 8))
-#define MAP_SEVEN_ISLAND_TRAINER_TOWER_7F             (7 | (2 << 8))
-#define MAP_SEVEN_ISLAND_TRAINER_TOWER_8F             (8 | (2 << 8))
-#define MAP_SEVEN_ISLAND_TRAINER_TOWER_ROOF           (9 | (2 << 8))
-#define MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY          (10 | (2 << 8))
-#define MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR       (11 | (2 << 8))
+#define MAP_TRAINER_TOWER_1F                          (1 | (2 << 8))
+#define MAP_TRAINER_TOWER_2F                          (2 | (2 << 8))
+#define MAP_TRAINER_TOWER_3F                          (3 | (2 << 8))
+#define MAP_TRAINER_TOWER_4F                          (4 | (2 << 8))
+#define MAP_TRAINER_TOWER_5F                          (5 | (2 << 8))
+#define MAP_TRAINER_TOWER_6F                          (6 | (2 << 8))
+#define MAP_TRAINER_TOWER_7F                          (7 | (2 << 8))
+#define MAP_TRAINER_TOWER_8F                          (8 | (2 << 8))
+#define MAP_TRAINER_TOWER_ROOF                        (9 | (2 << 8))
+#define MAP_TRAINER_TOWER_LOBBY                       (10 | (2 << 8))
+#define MAP_TRAINER_TOWER_ELEVATOR                    (11 | (2 << 8))
 #define MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE            (12 | (2 << 8))
 #define MAP_FIVE_ISLAND_LOST_CAVE_ROOM1               (13 | (2 << 8))
 #define MAP_FIVE_ISLAND_LOST_CAVE_ROOM2               (14 | (2 << 8))
@@ -207,7 +207,7 @@
 #define MAP_CINNABAR_ISLAND                      (8 | (3 << 8))
 #define MAP_INDIGO_PLATEAU_EXTERIOR              (9 | (3 << 8))
 #define MAP_SAFFRON_CITY                         (10 | (3 << 8))
-#define MAP_SAFFRON_CITY_CLASSIC                 (11 | (3 << 8))
+#define MAP_SAFFRON_CITY_CONNECTION              (11 | (3 << 8))
 #define MAP_ONE_ISLAND                           (12 | (3 << 8))
 #define MAP_TWO_ISLAND                           (13 | (3 << 8))
 #define MAP_THREE_ISLAND                         (14 | (3 << 8))
@@ -246,10 +246,10 @@
 #define MAP_TWO_ISLAND_CAPE_BRINK                (47 | (3 << 8))
 #define MAP_THREE_ISLAND_BOND_BRIDGE             (48 | (3 << 8))
 #define MAP_THREE_ISLAND_PORT                    (49 | (3 << 8))
-#define MAP_UNKNOWN_MAP_03_50                    (50 | (3 << 8))
-#define MAP_UNKNOWN_MAP_03_51                    (51 | (3 << 8))
-#define MAP_UNKNOWN_MAP_03_52                    (52 | (3 << 8))
-#define MAP_UNKNOWN_MAP_03_53                    (53 | (3 << 8))
+#define MAP_PROTOTYPE_SEVII_ISLE_6               (50 | (3 << 8))
+#define MAP_PROTOTYPE_SEVII_ISLE_7               (51 | (3 << 8))
+#define MAP_PROTOTYPE_SEVII_ISLE_8               (52 | (3 << 8))
+#define MAP_PROTOTYPE_SEVII_ISLE_9               (53 | (3 << 8))
 #define MAP_FIVE_ISLAND_RESORT_GORGEOUS          (54 | (3 << 8))
 #define MAP_FIVE_ISLAND_WATER_LABYRINTH          (55 | (3 << 8))
 #define MAP_FIVE_ISLAND_MEADOW                   (56 | (3 << 8))
@@ -366,15 +366,15 @@
 #define MAP_INDIGO_PLATEAU_POKEMON_CENTER_2F (1 | (13 << 8))
 
 // Map Group 14
-#define MAP_SAFFRON_CITY_HOUSE1_1F                (0 | (14 << 8))
-#define MAP_SAFFRON_CITY_HOUSE1_2F                (1 | (14 << 8))
+#define MAP_SAFFRON_CITY_COPYCATS_HOUSE_1F        (0 | (14 << 8))
+#define MAP_SAFFRON_CITY_COPYCATS_HOUSE_2F        (1 | (14 << 8))
 #define MAP_SAFFRON_CITY_DOJO                     (2 | (14 << 8))
 #define MAP_SAFFRON_CITY_GYM                      (3 | (14 << 8))
-#define MAP_SAFFRON_CITY_HOUSE2                   (4 | (14 << 8))
+#define MAP_SAFFRON_CITY_HOUSE                    (4 | (14 << 8))
 #define MAP_SAFFRON_CITY_MART                     (5 | (14 << 8))
 #define MAP_SAFFRON_CITY_POKEMON_CENTER_1F        (6 | (14 << 8))
 #define MAP_SAFFRON_CITY_POKEMON_CENTER_2F        (7 | (14 << 8))
-#define MAP_SAFFRON_CITY_HOUSE3                   (8 | (14 << 8))
+#define MAP_SAFFRON_CITY_MR_PSYCHICS_HOUSE        (8 | (14 << 8))
 #define MAP_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB (9 | (14 << 8))
 
 // Map Group 15