Merge pull request #1326 from GriffinRichards/doc-layouts

Label unused layouts

2 files changed, 86 insertions, 86 deletions

diff --git a/include/constants/layouts.h b/include/constants/layouts.h
index 9d5e877b0..db92c9594 100755
--- a/include/constants/layouts.h
+++ b/include/constants/layouts.h
@@ -79,7 +79,7 @@
 #define LAYOUT_FALLARBOR_TOWN_LEFTOVER_RSCONTEST_LOBBY 72
 #define LAYOUT_FALLARBOR_TOWN_LEFTOVER_RSCONTEST_HALL 73
 #define LAYOUT_LILYCOVE_CITY_HOUSE2 74
-#define LAYOUT_UNKNOWN_08428450 75
+#define LAYOUT_UNUSED_CONTEST_ROOM1 75
 #define LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE 76
 #define LAYOUT_PACIFIDLOG_TOWN_HOUSE1 77
 #define LAYOUT_PACIFIDLOG_TOWN_HOUSE2 78
@@ -87,8 +87,8 @@
 #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_084294C4 83
-#define LAYOUT_UNKNOWN_084294E8 84
+#define LAYOUT_UNUSED_CONTEST_ROOM2 83
+#define LAYOUT_UNUSED_CONTEST_ROOM3 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
@@ -174,20 +174,20 @@
 #define LAYOUT_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM 167
 #define LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM 168
 #define LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM 169
-#define LAYOUT_UNKNOWN_0843E6C0 170
-#define LAYOUT_UNKNOWN_0843E6E4 171
-#define LAYOUT_UNKNOWN_0843E708 172
-#define LAYOUT_UNKNOWN_0843E72C 173
-#define LAYOUT_UNKNOWN_0843E750 174
-#define LAYOUT_UNKNOWN_0843E774 175
-#define LAYOUT_UNKNOWN_0843E798 176
-#define LAYOUT_UNKNOWN_0843E7BC 177
-#define LAYOUT_UNKNOWN_0843E7E0 178
-#define LAYOUT_UNKNOWN_0843E804 179
-#define LAYOUT_UNKNOWN_0843E828 180
-#define LAYOUT_UNKNOWN_0843E84C 181
-#define LAYOUT_UNKNOWN_0843E870 182
-#define LAYOUT_UNKNOWN_0843E894 183
+#define LAYOUT_UNUSED_CAVE1 170
+#define LAYOUT_UNUSED_CAVE2 171
+#define LAYOUT_UNUSED_CAVE3 172
+#define LAYOUT_UNUSED_CAVE4 173
+#define LAYOUT_UNUSED_CAVE5 174
+#define LAYOUT_UNUSED_CAVE6 175
+#define LAYOUT_UNUSED_CAVE7 176
+#define LAYOUT_UNUSED_CAVE8 177
+#define LAYOUT_UNUSED_CAVE9 178
+#define LAYOUT_UNUSED_CAVE10 179
+#define LAYOUT_UNUSED_CAVE11 180
+#define LAYOUT_UNUSED_CAVE12 181
+#define LAYOUT_UNUSED_CAVE13 182
+#define LAYOUT_UNUSED_CAVE14 183
 #define LAYOUT_NEW_MAUVILLE_ENTRANCE 184
 #define LAYOUT_NEW_MAUVILLE_INSIDE 185
 #define LAYOUT_ABANDONED_SHIP_DECK 186
@@ -230,12 +230,12 @@
 #define LAYOUT_RECORD_CORNER 223
 #define LAYOUT_BATTLE_COLOSSEUM_4P 224
 #define LAYOUT_CONTEST_HALL 225
-#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29 226
-#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_30 227
-#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_31 228
-#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_32 229
-#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_33 230
-#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_34 231
+#define LAYOUT_UNUSED_CONTEST_HALL1 226
+#define LAYOUT_UNUSED_CONTEST_HALL2 227
+#define LAYOUT_UNUSED_CONTEST_HALL3 228
+#define LAYOUT_UNUSED_CONTEST_HALL4 229
+#define LAYOUT_UNUSED_CONTEST_HALL5 230
+#define LAYOUT_UNUSED_CONTEST_HALL6 231
 #define LAYOUT_CONTEST_HALL_BEAUTY 232
 #define LAYOUT_CONTEST_HALL_TOUGH 233
 #define LAYOUT_CONTEST_HALL_COOL 234
@@ -246,7 +246,7 @@
 #define LAYOUT_SAFARI_ZONE_NORTH 239
 #define LAYOUT_SAFARI_ZONE_SOUTHWEST 240
 #define LAYOUT_SAFARI_ZONE_SOUTH 241
-#define LAYOUT_UNKNOWN_08447028 242
+#define LAYOUT_UNUSED_OUTDOOR_AREA 242
 #define LAYOUT_ROUTE109_SEASHORE_HOUSE 243
 #define LAYOUT_ROUTE110_TRICK_HOUSE_ENTRANCE 244
 #define LAYOUT_ROUTE110_TRICK_HOUSE_END 245
@@ -363,7 +363,7 @@
 #define LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM 356
 #define LAYOUT_SOOTOPOLIS_CITY_LEGENDS_BATTLE 357
 #define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS 358
-#define LAYOUT_UNKNOWN_084693AC 359
+#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_UNUSED 359
 #define LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY 360
 #define LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR 361
 #define LAYOUT_BATTLE_PYRAMID_SQUARE01 362
diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h
index 69355635b..c650600e8 100755
--- a/include/constants/map_groups.h
+++ b/include/constants/map_groups.h
@@ -402,67 +402,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_BATTLE_COLOSSEUM_2P             (24 | (25 << 8))
-#define MAP_TRADE_CENTER                    (25 | (25 << 8))
-#define MAP_RECORD_CORNER                   (26 | (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_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))
-#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_BATTLE_COLOSSEUM_2P      (24 | (25 << 8))
+#define MAP_TRADE_CENTER             (25 | (25 << 8))
+#define MAP_RECORD_CORNER            (26 | (25 << 8))
+#define MAP_BATTLE_COLOSSEUM_4P      (27 | (25 << 8))
+#define MAP_CONTEST_HALL             (28 | (25 << 8))
+#define MAP_UNUSED_CONTEST_HALL1     (29 | (25 << 8))
+#define MAP_UNUSED_CONTEST_HALL2     (30 | (25 << 8))
+#define MAP_UNUSED_CONTEST_HALL3     (31 | (25 << 8))
+#define MAP_UNUSED_CONTEST_HALL4     (32 | (25 << 8))
+#define MAP_UNUSED_CONTEST_HALL5     (33 | (25 << 8))
+#define MAP_UNUSED_CONTEST_HALL6     (34 | (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))
+#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))