Merge branch 'master' into document-eventscripts

1 files changed, 61 insertions, 61 deletions

diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h
index dc2ac2f32..6a3276b44 100755
--- a/include/constants/map_groups.h
+++ b/include/constants/map_groups.h
@@ -398,67 +398,67 @@
 #define MAP_METEOR_FALLS_STEVENS_CAVE                (107 | (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))
-#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))
+#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_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_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))
+#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))