Use map type constants in map headers

2018-07-12 22:39:38 -05:00
parent d53e8137cd
commit 546819bc72
527 changed files with 551 additions and 547 deletions
--- a/data/maps.s
+++ b/data/maps.s
@@ -1,4 +1,6 @@
+#include "constants/map_types.h"
 #include "constants/maps.h"
+#include "constants/weather.h"
 #include "constants/region_map_sections.h"
 #include "constants/songs.h"
 #include "constants/weather.h"
--- a/data/maps/AbandonedShip_CaptainsOffice/header.inc
+++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc
@@ -8,7 +8,7 @@ AbandonedShip_CaptainsOffice: @ 84845A4
 	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
 	.byte WEATHER_SHADE
-	.byte 4
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
 	.byte 0
--- a/data/maps/AbandonedShip_Corridors_1F/header.inc
+++ b/data/maps/AbandonedShip_Corridors_1F/header.inc
@@ -8,7 +8,7 @@ AbandonedShip_Corridors_1F: @ 84844C4
 	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
 	.byte WEATHER_SHADE
-	.byte 4
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
 	.byte 0
--- a/data/maps/AbandonedShip_Corridors_B1F/header.inc
+++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc
@@ -8,7 +8,7 @@ AbandonedShip_Corridors_B1F: @ 84844FC
 	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
 	.byte WEATHER_SHADE
-	.byte 4
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
 	.byte 0
--- a/data/maps/AbandonedShip_Deck/header.inc
+++ b/data/maps/AbandonedShip_Deck/header.inc
@@ -8,7 +8,7 @@ AbandonedShip_Deck: @ 84844A8
 	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 4
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
 	.byte 0
--- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
@@ -8,7 +8,7 @@ AbandonedShip_HiddenFloorCorridors: @ 84845DC
 	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
 	.byte WEATHER_SHADE
-	.byte 4
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
 	.byte 0
--- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc
@@ -8,7 +8,7 @@ AbandonedShip_HiddenFloorRooms: @ 84845F8
 	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
 	.byte WEATHER_SHADE
-	.byte 4
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 7
 	.byte 0
--- a/data/maps/AbandonedShip_Room_B1F/header.inc
+++ b/data/maps/AbandonedShip_Room_B1F/header.inc
@@ -8,7 +8,7 @@ AbandonedShip_Room_B1F: @ 848456C
 	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
 	.byte WEATHER_SHADE
-	.byte 4
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
 	.byte 0
--- a/data/maps/AbandonedShip_Rooms2_1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc
@@ -8,7 +8,7 @@ AbandonedShip_Rooms2_1F: @ 8484588
 	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
 	.byte WEATHER_SHADE
-	.byte 4
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
 	.byte 0
--- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc
@@ -8,7 +8,7 @@ AbandonedShip_Rooms2_B1F: @ 8484534
 	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
 	.byte WEATHER_SHADE
-	.byte 4
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
 	.byte 0
--- a/data/maps/AbandonedShip_Rooms_1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms_1F/header.inc
@@ -8,7 +8,7 @@ AbandonedShip_Rooms_1F: @ 84844E0
 	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
 	.byte WEATHER_SHADE
-	.byte 4
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
 	.byte 0
--- a/data/maps/AbandonedShip_Rooms_B1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc
@@ -8,7 +8,7 @@ AbandonedShip_Rooms_B1F: @ 8484518
 	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
 	.byte WEATHER_SHADE
-	.byte 4
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
 	.byte 0
--- a/data/maps/AbandonedShip_Underwater1/header.inc
+++ b/data/maps/AbandonedShip_Underwater1/header.inc
@@ -8,7 +8,7 @@ AbandonedShip_Underwater1: @ 8484550
 	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
 	.byte WEATHER_BUBBLES
-	.byte 5
+	.byte MAP_TYPE_UNDERWATER
 	.2byte 0
 	.byte 13
 	.byte 0
--- a/data/maps/AbandonedShip_Underwater2/header.inc
+++ b/data/maps/AbandonedShip_Underwater2/header.inc
@@ -8,7 +8,7 @@ AbandonedShip_Underwater2: @ 84845C0
 	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
 	.byte WEATHER_BUBBLES
-	.byte 5
+	.byte MAP_TYPE_UNDERWATER
 	.2byte 0
 	.byte 13
 	.byte 0
--- a/data/maps/AlteringCave/header.inc
+++ b/data/maps/AlteringCave/header.inc
@@ -8,7 +8,7 @@ AlteringCave: @ 8484A58
 	.byte MAPSEC_ALTERING_CAVE_2
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 4
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
 	.byte 0
--- a/data/maps/AncientTomb/header.inc
+++ b/data/maps/AncientTomb/header.inc
@@ -8,7 +8,7 @@ AncientTomb: @ 8484630
 	.byte MAPSEC_ANCIENT_TOMB
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 4
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
 	.byte 0
--- a/data/maps/AquaHideout_1F/header.inc
+++ b/data/maps/AquaHideout_1F/header.inc
@@ -8,7 +8,7 @@ AquaHideout_1F: @ 8484144
 	.byte MAPSEC_AQUA_HIDEOUT
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 8
 	.byte 3
--- a/data/maps/AquaHideout_B1F/header.inc
+++ b/data/maps/AquaHideout_B1F/header.inc
@@ -8,7 +8,7 @@ AquaHideout_B1F: @ 8484160
 	.byte MAPSEC_AQUA_HIDEOUT
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 8
 	.byte 3
--- a/data/maps/AquaHideout_B2F/header.inc
+++ b/data/maps/AquaHideout_B2F/header.inc
@@ -8,7 +8,7 @@ AquaHideout_B2F: @ 848417C
 	.byte MAPSEC_AQUA_HIDEOUT
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 8
 	.byte 3
--- a/data/maps/AquaHideout_UnusedRubyMap1/header.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap1/header.inc
@@ -8,7 +8,7 @@ AquaHideout_UnusedRubyMap1: @ 84846D8
 	.byte MAPSEC_AQUA_HIDEOUT
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 4
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
 	.byte 2
--- a/data/maps/AquaHideout_UnusedRubyMap2/header.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap2/header.inc
@@ -8,7 +8,7 @@ AquaHideout_UnusedRubyMap2: @ 84846F4
 	.byte MAPSEC_AQUA_HIDEOUT
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 4
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
 	.byte 2
--- a/data/maps/AquaHideout_UnusedRubyMap3/header.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap3/header.inc
@@ -8,7 +8,7 @@ AquaHideout_UnusedRubyMap3: @ 8484710
 	.byte MAPSEC_AQUA_HIDEOUT
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 4
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
 	.byte 2
--- a/data/maps/ArtisanCave_1F/header.inc
+++ b/data/maps/ArtisanCave_1F/header.inc
@@ -8,7 +8,7 @@ ArtisanCave_1F: @ 84849B0
 	.byte MAPSEC_ARTISAN_CAVE
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 4
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
 	.byte 0
--- a/data/maps/ArtisanCave_B1F/header.inc
+++ b/data/maps/ArtisanCave_B1F/header.inc
@@ -8,7 +8,7 @@ ArtisanCave_B1F: @ 8484994
 	.byte MAPSEC_ARTISAN_CAVE
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 4
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
 	.byte 0
--- a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_BattleArenaBattleRoom: @ 8485484
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 0
--- a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_BattleArenaCorridor: @ 8485468
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 0
--- a/data/maps/BattleFrontier_BattleArenaLobby/header.inc
+++ b/data/maps/BattleFrontier_BattleArenaLobby/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_BattleArenaLobby: @ 848544C
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 0
--- a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_BattleDomeBattleRoom: @ 8485388
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 0
--- a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_BattleDomeCorridor: @ 8485350
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 0
--- a/data/maps/BattleFrontier_BattleDomeLobby/header.inc
+++ b/data/maps/BattleFrontier_BattleDomeLobby/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_BattleDomeLobby: @ 8485334
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 0
--- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_BattleDomePreBattleRoom: @ 848536C
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 0
--- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_BattleFactoryBattleRoom: @ 84854D8
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 0
--- a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc
+++ b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_BattleFactoryLobby: @ 84854A0
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 0
--- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_BattleFactoryPreBattleRoom: @ 84854BC
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 0
--- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_BattlePalaceBattleRoom: @ 84853DC
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 0
--- a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_BattlePalaceCorridor: @ 84853C0
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 0
--- a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc
+++ b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_BattlePalaceLobby: @ 84853A4
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 0
--- a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_BattlePikeCorridor: @ 8485510
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 4
 	.byte 0
--- a/data/maps/BattleFrontier_BattlePikeLobby/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeLobby/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_BattlePikeLobby: @ 84854F4
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 0
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_BattlePikeRandomRoom1: @ 8485548
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 4
 	.byte 0
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_BattlePikeRandomRoom2: @ 8485564
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 4
 	.byte 0
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_BattlePikeRandomRoom3: @ 8485580
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 4
 	.byte 0
--- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_BattlePikeThreePathRoom: @ 848552C
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 4
 	.byte 0
--- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc
+++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_BattlePointExchangeServiceCorner: @ 84855D4
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 0
--- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc
+++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_BattlePyramidEmptySquare: @ 8485414
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 4
 	.byte 0
--- a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc
+++ b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_BattlePyramidLobby: @ 84853F8
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 0
--- a/data/maps/BattleFrontier_BattlePyramidTop/header.inc
+++ b/data/maps/BattleFrontier_BattlePyramidTop/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_BattlePyramidTop: @ 8485430
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 4
 	.byte 0
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_BattleTowerBattleRoom: @ 848521C
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 8
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_BattleTowerBattleRoom2: @ 8485318
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 8
--- a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_BattleTowerCorridor: @ 8485200
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 0
--- a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_BattleTowerCorridor2: @ 84852FC
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 0
--- a/data/maps/BattleFrontier_BattleTowerElevator/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerElevator/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_BattleTowerElevator: @ 84851E4
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 0
--- a/data/maps/BattleFrontier_BattleTowerLobby/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerLobby/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_BattleTowerLobby: @ 84851C8
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 0
--- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_BattleTowerMultiBattleRoom: @ 84852E0
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 4
 	.byte 0
--- a/data/maps/BattleFrontier_Lounge1/header.inc
+++ b/data/maps/BattleFrontier_Lounge1/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_Lounge1: @ 84855B8
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 0
--- a/data/maps/BattleFrontier_Lounge2/header.inc
+++ b/data/maps/BattleFrontier_Lounge2/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_Lounge2: @ 84855F0
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 0
--- a/data/maps/BattleFrontier_Lounge3/header.inc
+++ b/data/maps/BattleFrontier_Lounge3/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_Lounge3: @ 848560C
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 0
--- a/data/maps/BattleFrontier_Lounge4/header.inc
+++ b/data/maps/BattleFrontier_Lounge4/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_Lounge4: @ 8485628
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 0
--- a/data/maps/BattleFrontier_Lounge5/header.inc
+++ b/data/maps/BattleFrontier_Lounge5/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_Lounge5: @ 8485660
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 0
--- a/data/maps/BattleFrontier_Lounge6/header.inc
+++ b/data/maps/BattleFrontier_Lounge6/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_Lounge6: @ 848567C
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 0
--- a/data/maps/BattleFrontier_Lounge7/header.inc
+++ b/data/maps/BattleFrontier_Lounge7/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_Lounge7: @ 8485698
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 0
--- a/data/maps/BattleFrontier_Lounge8/header.inc
+++ b/data/maps/BattleFrontier_Lounge8/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_Lounge8: @ 84856D0
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 0
--- a/data/maps/BattleFrontier_Lounge9/header.inc
+++ b/data/maps/BattleFrontier_Lounge9/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_Lounge9: @ 84856EC
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 0
--- a/data/maps/BattleFrontier_Mart/header.inc
+++ b/data/maps/BattleFrontier_Mart/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_Mart: @ 8485740
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 0
--- a/data/maps/BattleFrontier_OutsideEast/header.inc
+++ b/data/maps/BattleFrontier_OutsideEast/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_OutsideEast: @ 84852C4
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 3
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
 	.byte 0
--- a/data/maps/BattleFrontier_OutsideWest/header.inc
+++ b/data/maps/BattleFrontier_OutsideWest/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_OutsideWest: @ 84851AC
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 3
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
 	.byte 0
--- a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc
+++ b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_PokemonCenter_1F: @ 8485708
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 0
--- a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc
+++ b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_PokemonCenter_2F: @ 8485724
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 0
--- a/data/maps/BattleFrontier_RankingHall/header.inc
+++ b/data/maps/BattleFrontier_RankingHall/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_RankingHall: @ 848559C
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 0
--- a/data/maps/BattleFrontier_ReceptionGate/header.inc
+++ b/data/maps/BattleFrontier_ReceptionGate/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_ReceptionGate: @ 84856B4
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 0
--- a/data/maps/BattleFrontier_ScottsHouse/header.inc
+++ b/data/maps/BattleFrontier_ScottsHouse/header.inc
@@ -8,7 +8,7 @@ BattleFrontier_ScottsHouse: @ 8485644
 	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 0
--- a/data/maps/BattlePyramidSquare01/header.inc
+++ b/data/maps/BattlePyramidSquare01/header.inc
@@ -8,7 +8,7 @@ BattlePyramidSquare01: @ 8484F60
 	.byte MAPSEC_DYNAMIC
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 1
--- a/data/maps/BattlePyramidSquare02/header.inc
+++ b/data/maps/BattlePyramidSquare02/header.inc
@@ -8,7 +8,7 @@ BattlePyramidSquare02: @ 8484F7C
 	.byte MAPSEC_DYNAMIC
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 1
--- a/data/maps/BattlePyramidSquare03/header.inc
+++ b/data/maps/BattlePyramidSquare03/header.inc
@@ -8,7 +8,7 @@ BattlePyramidSquare03: @ 8484F98
 	.byte MAPSEC_DYNAMIC
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 1
--- a/data/maps/BattlePyramidSquare04/header.inc
+++ b/data/maps/BattlePyramidSquare04/header.inc
@@ -8,7 +8,7 @@ BattlePyramidSquare04: @ 8484FB4
 	.byte MAPSEC_DYNAMIC
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 1
--- a/data/maps/BattlePyramidSquare05/header.inc
+++ b/data/maps/BattlePyramidSquare05/header.inc
@@ -8,7 +8,7 @@ BattlePyramidSquare05: @ 8484FD0
 	.byte MAPSEC_DYNAMIC
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 1
--- a/data/maps/BattlePyramidSquare06/header.inc
+++ b/data/maps/BattlePyramidSquare06/header.inc
@@ -8,7 +8,7 @@ BattlePyramidSquare06: @ 8484FEC
 	.byte MAPSEC_DYNAMIC
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 1
--- a/data/maps/BattlePyramidSquare07/header.inc
+++ b/data/maps/BattlePyramidSquare07/header.inc
@@ -8,7 +8,7 @@ BattlePyramidSquare07: @ 8485008
 	.byte MAPSEC_DYNAMIC
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 1
--- a/data/maps/BattlePyramidSquare08/header.inc
+++ b/data/maps/BattlePyramidSquare08/header.inc
@@ -8,7 +8,7 @@ BattlePyramidSquare08: @ 8485024
 	.byte MAPSEC_DYNAMIC
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 1
--- a/data/maps/BattlePyramidSquare09/header.inc
+++ b/data/maps/BattlePyramidSquare09/header.inc
@@ -8,7 +8,7 @@ BattlePyramidSquare09: @ 8485040
 	.byte MAPSEC_DYNAMIC
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 1
--- a/data/maps/BattlePyramidSquare10/header.inc
+++ b/data/maps/BattlePyramidSquare10/header.inc
@@ -8,7 +8,7 @@ BattlePyramidSquare10: @ 848505C
 	.byte MAPSEC_DYNAMIC
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 1
--- a/data/maps/BattlePyramidSquare11/header.inc
+++ b/data/maps/BattlePyramidSquare11/header.inc
@@ -8,7 +8,7 @@ BattlePyramidSquare11: @ 8485078
 	.byte MAPSEC_DYNAMIC
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 1
--- a/data/maps/BattlePyramidSquare12/header.inc
+++ b/data/maps/BattlePyramidSquare12/header.inc
@@ -8,7 +8,7 @@ BattlePyramidSquare12: @ 8485094
 	.byte MAPSEC_DYNAMIC
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 1
--- a/data/maps/BattlePyramidSquare13/header.inc
+++ b/data/maps/BattlePyramidSquare13/header.inc
@@ -8,7 +8,7 @@ BattlePyramidSquare13: @ 84850B0
 	.byte MAPSEC_DYNAMIC
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 1
--- a/data/maps/BattlePyramidSquare14/header.inc
+++ b/data/maps/BattlePyramidSquare14/header.inc
@@ -8,7 +8,7 @@ BattlePyramidSquare14: @ 84850CC
 	.byte MAPSEC_DYNAMIC
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 1
--- a/data/maps/BattlePyramidSquare15/header.inc
+++ b/data/maps/BattlePyramidSquare15/header.inc
@@ -8,7 +8,7 @@ BattlePyramidSquare15: @ 84850E8
 	.byte MAPSEC_DYNAMIC
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 1
--- a/data/maps/BattlePyramidSquare16/header.inc
+++ b/data/maps/BattlePyramidSquare16/header.inc
@@ -8,7 +8,7 @@ BattlePyramidSquare16: @ 8485104
 	.byte MAPSEC_DYNAMIC
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 1
--- a/data/maps/BirthIsland_Exterior/header.inc
+++ b/data/maps/BirthIsland_Exterior/header.inc
@@ -8,7 +8,7 @@ BirthIsland_Exterior: @ 8485794
 	.byte MAPSEC_BIRTH_ISLAND_2
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 12
 	.byte 0
--- a/data/maps/BirthIsland_Harbor/header.inc
+++ b/data/maps/BirthIsland_Harbor/header.inc
@@ -8,7 +8,7 @@ BirthIsland_Harbor: @ 84857B0
 	.byte MAPSEC_BIRTH_ISLAND_2
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 0
--- a/data/maps/CaveOfOrigin_1F/header.inc
+++ b/data/maps/CaveOfOrigin_1F/header.inc
@@ -8,7 +8,7 @@ CaveOfOrigin_1F: @ 84842E8
 	.byte MAPSEC_CAVE_OF_ORIGIN
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 4
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
 	.byte 0
--- a/data/maps/CaveOfOrigin_B1F/header.inc
+++ b/data/maps/CaveOfOrigin_B1F/header.inc
@@ -8,7 +8,7 @@ CaveOfOrigin_B1F: @ 8484358
 	.byte MAPSEC_CAVE_OF_ORIGIN
 	.byte 0
 	.byte WEATHER_FOG_1
-	.byte 4
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 14
 	.byte 0
--- a/data/maps/CaveOfOrigin_Entrance/header.inc
+++ b/data/maps/CaveOfOrigin_Entrance/header.inc
@@ -8,7 +8,7 @@ CaveOfOrigin_Entrance: @ 84842CC
 	.byte MAPSEC_CAVE_OF_ORIGIN
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 4
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
 	.byte 0
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc
@@ -8,7 +8,7 @@ CaveOfOrigin_UnusedRubySapphireMap1: @ 8484304
 	.byte MAPSEC_CAVE_OF_ORIGIN
 	.byte 1
 	.byte WEATHER_NONE
-	.byte 4
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
 	.byte 0
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc
@@ -8,7 +8,7 @@ CaveOfOrigin_UnusedRubySapphireMap2: @ 8484320
 	.byte MAPSEC_CAVE_OF_ORIGIN
 	.byte 1
 	.byte WEATHER_FOG_1
-	.byte 4
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
 	.byte 0
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc
@@ -8,7 +8,7 @@ CaveOfOrigin_UnusedRubySapphireMap3: @ 848433C
 	.byte MAPSEC_CAVE_OF_ORIGIN
 	.byte 1
 	.byte WEATHER_FOG_1
-	.byte 4
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
 	.byte 0
--- a/data/maps/DesertRuins/header.inc
+++ b/data/maps/DesertRuins/header.inc
@@ -8,7 +8,7 @@ DesertRuins: @ 8483F68
 	.byte MAPSEC_DESERT_RUINS
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 4
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
 	.byte 0
--- a/data/maps/DesertUnderpass/header.inc
+++ b/data/maps/DesertUnderpass/header.inc
@@ -8,7 +8,7 @@ DesertUnderpass: @ 8484978
 	.byte MAPSEC_DESERT_UNDERPASS
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 4
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
 	.byte 0
--- a/data/maps/DewfordTown/header.inc
+++ b/data/maps/DewfordTown/header.inc
@@ -8,7 +8,7 @@ DewfordTown: @ 84825EC
 	.byte MAPSEC_DEWFORD_TOWN
 	.byte 0
 	.byte WEATHER_SUNNY
-	.byte 1
+	.byte MAP_TYPE_TOWN
 	.2byte 0
 	.byte 13
 	.byte 0
--- a/data/maps/DewfordTown_Gym/header.inc
+++ b/data/maps/DewfordTown_Gym/header.inc
@@ -8,7 +8,7 @@ DewfordTown_Gym: @ 8482C60
 	.byte MAPSEC_DEWFORD_TOWN
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 1
--- a/data/maps/DewfordTown_Hall/header.inc
+++ b/data/maps/DewfordTown_Hall/header.inc
@@ -8,7 +8,7 @@ DewfordTown_Hall: @ 8482C7C
 	.byte MAPSEC_DEWFORD_TOWN
 	.byte 0
 	.byte WEATHER_NONE
-	.byte 8
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
 	.byte 0
--- a/Show More
+++ b/Show More