Merge pull request #269 from camthesaxman/s_to_inc

rename extension of included .s files to .inc

510 files changed, 506 insertions, 506 deletions

diff --git a/data/experience_tables/erratic_growth_rate.s b/data/experience_tables/erratic_growth_rate.inc
index d3a455a9f..d3a455a9f 100644
--- a/data/experience_tables/erratic_growth_rate.s
+++ b/data/experience_tables/erratic_growth_rate.inc
diff --git a/data/experience_tables/fast_growth_rate.s b/data/experience_tables/fast_growth_rate.inc
index d8675fdc0..d8675fdc0 100644
--- a/data/experience_tables/fast_growth_rate.s
+++ b/data/experience_tables/fast_growth_rate.inc
diff --git a/data/experience_tables/fluctuating_growth_rate.s b/data/experience_tables/fluctuating_growth_rate.inc
index 81a962327..81a962327 100644
--- a/data/experience_tables/fluctuating_growth_rate.s
+++ b/data/experience_tables/fluctuating_growth_rate.inc
diff --git a/data/experience_tables/medium_fast_growth_rate.s b/data/experience_tables/medium_fast_growth_rate.inc
index 5a51dd381..5a51dd381 100644
--- a/data/experience_tables/medium_fast_growth_rate.s
+++ b/data/experience_tables/medium_fast_growth_rate.inc
diff --git a/data/experience_tables/medium_slow_growth_rate.s b/data/experience_tables/medium_slow_growth_rate.inc
index d4c16b8c0..d4c16b8c0 100644
--- a/data/experience_tables/medium_slow_growth_rate.s
+++ b/data/experience_tables/medium_slow_growth_rate.inc
diff --git a/data/experience_tables/slow_growth_rate.s b/data/experience_tables/slow_growth_rate.inc
index 8d10b34ed..8d10b34ed 100644
--- a/data/experience_tables/slow_growth_rate.s
+++ b/data/experience_tables/slow_growth_rate.inc
diff --git a/data/experience_tables/tables.inc b/data/experience_tables/tables.inc
index 5018efc0f..763d6f8bb 100644
--- a/data/experience_tables/tables.inc
+++ b/data/experience_tables/tables.inc
@@ -1,11 +1,11 @@
 	.align 2
 gExperienceTables:: @ 81FDF78
-	.include "data/experience_tables/medium_fast_growth_rate.s"
-	.include "data/experience_tables/erratic_growth_rate.s"
-	.include "data/experience_tables/fluctuating_growth_rate.s"
-	.include "data/experience_tables/medium_slow_growth_rate.s"
-	.include "data/experience_tables/fast_growth_rate.s"
-	.include "data/experience_tables/slow_growth_rate.s"
+	.include "data/experience_tables/medium_fast_growth_rate.inc"
+	.include "data/experience_tables/erratic_growth_rate.inc"
+	.include "data/experience_tables/fluctuating_growth_rate.inc"
+	.include "data/experience_tables/medium_slow_growth_rate.inc"
+	.include "data/experience_tables/fast_growth_rate.inc"
+	.include "data/experience_tables/slow_growth_rate.inc"
 @ TODO: find out if these copies are used
-	.include "data/experience_tables/medium_fast_growth_rate.s"
-	.include "data/experience_tables/medium_fast_growth_rate.s"
+	.include "data/experience_tables/medium_fast_growth_rate.inc"
+	.include "data/experience_tables/medium_fast_growth_rate.inc"
diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.s b/data/maps/AbandonedShip_CaptainsOffice/header.inc
index e5e3adc3a..e5e3adc3a 100644
--- a/data/maps/AbandonedShip_CaptainsOffice/header.s
+++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc
diff --git a/data/maps/AbandonedShip_Corridors_1F/header.s b/data/maps/AbandonedShip_Corridors_1F/header.inc
index e2bd23252..e2bd23252 100644
--- a/data/maps/AbandonedShip_Corridors_1F/header.s
+++ b/data/maps/AbandonedShip_Corridors_1F/header.inc
diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.s b/data/maps/AbandonedShip_Corridors_B1F/header.inc
index 064e24e92..064e24e92 100644
--- a/data/maps/AbandonedShip_Corridors_B1F/header.s
+++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc
diff --git a/data/maps/AbandonedShip_Deck/header.s b/data/maps/AbandonedShip_Deck/header.inc
index 1db367db8..1db367db8 100644
--- a/data/maps/AbandonedShip_Deck/header.s
+++ b/data/maps/AbandonedShip_Deck/header.inc
diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.s b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
index a841ee87c..a841ee87c 100644
--- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.s
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.s b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc
index 647b22977..647b22977 100644
--- a/data/maps/AbandonedShip_HiddenFloorRooms/header.s
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc
diff --git a/data/maps/AbandonedShip_Room_B1F/header.s b/data/maps/AbandonedShip_Room_B1F/header.inc
index 7b88baf94..7b88baf94 100644
--- a/data/maps/AbandonedShip_Room_B1F/header.s
+++ b/data/maps/AbandonedShip_Room_B1F/header.inc
diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.s b/data/maps/AbandonedShip_Rooms2_1F/header.inc
index 44bcd4733..44bcd4733 100644
--- a/data/maps/AbandonedShip_Rooms2_1F/header.s
+++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc
diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.s b/data/maps/AbandonedShip_Rooms2_B1F/header.inc
index 017b1382b..017b1382b 100644
--- a/data/maps/AbandonedShip_Rooms2_B1F/header.s
+++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc
diff --git a/data/maps/AbandonedShip_Rooms_1F/header.s b/data/maps/AbandonedShip_Rooms_1F/header.inc
index 7e8dbd5b8..7e8dbd5b8 100644
--- a/data/maps/AbandonedShip_Rooms_1F/header.s
+++ b/data/maps/AbandonedShip_Rooms_1F/header.inc
diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.s b/data/maps/AbandonedShip_Rooms_B1F/header.inc
index 6ac6e3794..6ac6e3794 100644
--- a/data/maps/AbandonedShip_Rooms_B1F/header.s
+++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc
diff --git a/data/maps/AbandonedShip_Underwater1/header.s b/data/maps/AbandonedShip_Underwater1/header.inc
index 6313cf6f1..6313cf6f1 100644
--- a/data/maps/AbandonedShip_Underwater1/header.s
+++ b/data/maps/AbandonedShip_Underwater1/header.inc
diff --git a/data/maps/AbandonedShip_Underwater2/header.s b/data/maps/AbandonedShip_Underwater2/header.inc
index c81b78357..c81b78357 100644
--- a/data/maps/AbandonedShip_Underwater2/header.s
+++ b/data/maps/AbandonedShip_Underwater2/header.inc
diff --git a/data/maps/AncientTomb/header.s b/data/maps/AncientTomb/header.inc
index 82ac0555d..82ac0555d 100644
--- a/data/maps/AncientTomb/header.s
+++ b/data/maps/AncientTomb/header.inc
diff --git a/data/maps/AquaHideout_1F/header.s b/data/maps/AquaHideout_1F/header.inc
index 94650821d..94650821d 100644
--- a/data/maps/AquaHideout_1F/header.s
+++ b/data/maps/AquaHideout_1F/header.inc
diff --git a/data/maps/AquaHideout_B1F/header.s b/data/maps/AquaHideout_B1F/header.inc
index ef7f4cfdf..ef7f4cfdf 100644
--- a/data/maps/AquaHideout_B1F/header.s
+++ b/data/maps/AquaHideout_B1F/header.inc
diff --git a/data/maps/AquaHideout_B2F/header.s b/data/maps/AquaHideout_B2F/header.inc
index 38b3f546f..38b3f546f 100644
--- a/data/maps/AquaHideout_B2F/header.s
+++ b/data/maps/AquaHideout_B2F/header.inc
diff --git a/data/maps/BattleTower_BattleRoom/header.s b/data/maps/BattleTower_BattleRoom/header.inc
index 3104824ed..3104824ed 100644
--- a/data/maps/BattleTower_BattleRoom/header.s
+++ b/data/maps/BattleTower_BattleRoom/header.inc
diff --git a/data/maps/BattleTower_Corridor/header.s b/data/maps/BattleTower_Corridor/header.inc
index 016e178ac..016e178ac 100644
--- a/data/maps/BattleTower_Corridor/header.s
+++ b/data/maps/BattleTower_Corridor/header.inc
diff --git a/data/maps/BattleTower_Elevator/header.s b/data/maps/BattleTower_Elevator/header.inc
index 0a7285261..0a7285261 100644
--- a/data/maps/BattleTower_Elevator/header.s
+++ b/data/maps/BattleTower_Elevator/header.inc
diff --git a/data/maps/BattleTower_Lobby/header.s b/data/maps/BattleTower_Lobby/header.inc
index c8c0b0473..c8c0b0473 100644
--- a/data/maps/BattleTower_Lobby/header.s
+++ b/data/maps/BattleTower_Lobby/header.inc
diff --git a/data/maps/BattleTower_Outside/header.s b/data/maps/BattleTower_Outside/header.inc
index 01bbc2fd9..01bbc2fd9 100644
--- a/data/maps/BattleTower_Outside/header.s
+++ b/data/maps/BattleTower_Outside/header.inc
diff --git a/data/maps/CaveOfOrigin_1F/header.s b/data/maps/CaveOfOrigin_1F/header.inc
index b49287535..b49287535 100644
--- a/data/maps/CaveOfOrigin_1F/header.s
+++ b/data/maps/CaveOfOrigin_1F/header.inc
diff --git a/data/maps/CaveOfOrigin_B1F/header.s b/data/maps/CaveOfOrigin_B1F/header.inc
index 97e5e68c8..97e5e68c8 100644
--- a/data/maps/CaveOfOrigin_B1F/header.s
+++ b/data/maps/CaveOfOrigin_B1F/header.inc
diff --git a/data/maps/CaveOfOrigin_B2F/header.s b/data/maps/CaveOfOrigin_B2F/header.inc
index 79e76f693..79e76f693 100644
--- a/data/maps/CaveOfOrigin_B2F/header.s
+++ b/data/maps/CaveOfOrigin_B2F/header.inc
diff --git a/data/maps/CaveOfOrigin_B3F/header.s b/data/maps/CaveOfOrigin_B3F/header.inc
index 746d187f3..746d187f3 100644
--- a/data/maps/CaveOfOrigin_B3F/header.s
+++ b/data/maps/CaveOfOrigin_B3F/header.inc
diff --git a/data/maps/CaveOfOrigin_B4F/header.s b/data/maps/CaveOfOrigin_B4F/header.inc
index 0cb1ad83b..0cb1ad83b 100644
--- a/data/maps/CaveOfOrigin_B4F/header.s
+++ b/data/maps/CaveOfOrigin_B4F/header.inc
diff --git a/data/maps/CaveOfOrigin_Entrance/header.s b/data/maps/CaveOfOrigin_Entrance/header.inc
index 606997174..606997174 100644
--- a/data/maps/CaveOfOrigin_Entrance/header.s
+++ b/data/maps/CaveOfOrigin_Entrance/header.inc
diff --git a/data/maps/DesertRuins/header.s b/data/maps/DesertRuins/header.inc
index 79e681666..79e681666 100644
--- a/data/maps/DesertRuins/header.s
+++ b/data/maps/DesertRuins/header.inc
diff --git a/data/maps/DewfordTown/connections.s b/data/maps/DewfordTown/connections.inc
index 4f47ce304..4f47ce304 100644
--- a/data/maps/DewfordTown/connections.s
+++ b/data/maps/DewfordTown/connections.inc
diff --git a/data/maps/DewfordTown/header.s b/data/maps/DewfordTown/header.inc
index 7aed01d94..7aed01d94 100644
--- a/data/maps/DewfordTown/header.s
+++ b/data/maps/DewfordTown/header.inc
diff --git a/data/maps/DewfordTown_Gym/header.s b/data/maps/DewfordTown_Gym/header.inc
index 79227e545..79227e545 100644
--- a/data/maps/DewfordTown_Gym/header.s
+++ b/data/maps/DewfordTown_Gym/header.inc
diff --git a/data/maps/DewfordTown_Hall/header.s b/data/maps/DewfordTown_Hall/header.inc
index 975a257d8..975a257d8 100644
--- a/data/maps/DewfordTown_Hall/header.s
+++ b/data/maps/DewfordTown_Hall/header.inc
diff --git a/data/maps/DewfordTown_House1/header.s b/data/maps/DewfordTown_House1/header.inc
index 95a8a8339..95a8a8339 100644
--- a/data/maps/DewfordTown_House1/header.s
+++ b/data/maps/DewfordTown_House1/header.inc
diff --git a/data/maps/DewfordTown_House2/header.s b/data/maps/DewfordTown_House2/header.inc
index 37aac2ead..37aac2ead 100644
--- a/data/maps/DewfordTown_House2/header.s
+++ b/data/maps/DewfordTown_House2/header.inc
diff --git a/data/maps/DewfordTown_PokemonCenter_1F/header.s b/data/maps/DewfordTown_PokemonCenter_1F/header.inc
index 9cf0a8f46..9cf0a8f46 100644
--- a/data/maps/DewfordTown_PokemonCenter_1F/header.s
+++ b/data/maps/DewfordTown_PokemonCenter_1F/header.inc
diff --git a/data/maps/DewfordTown_PokemonCenter_2F/header.s b/data/maps/DewfordTown_PokemonCenter_2F/header.inc
index a54a51c94..a54a51c94 100644
--- a/data/maps/DewfordTown_PokemonCenter_2F/header.s
+++ b/data/maps/DewfordTown_PokemonCenter_2F/header.inc
diff --git a/data/maps/DoubleBattleColosseum/header.s b/data/maps/DoubleBattleColosseum/header.inc
index baf1b8076..baf1b8076 100644
--- a/data/maps/DoubleBattleColosseum/header.s
+++ b/data/maps/DoubleBattleColosseum/header.inc
diff --git a/data/maps/EverGrandeCity/connections.s b/data/maps/EverGrandeCity/connections.inc
index fd81ce46b..fd81ce46b 100644
--- a/data/maps/EverGrandeCity/connections.s
+++ b/data/maps/EverGrandeCity/connections.inc
diff --git a/data/maps/EverGrandeCity/header.s b/data/maps/EverGrandeCity/header.inc
index 0c1f6eab0..0c1f6eab0 100644
--- a/data/maps/EverGrandeCity/header.s
+++ b/data/maps/EverGrandeCity/header.inc
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.s b/data/maps/EverGrandeCity_ChampionsRoom/header.inc
index 154d5ba29..154d5ba29 100644
--- a/data/maps/EverGrandeCity_ChampionsRoom/header.s
+++ b/data/maps/EverGrandeCity_ChampionsRoom/header.inc
diff --git a/data/maps/EverGrandeCity_Corridor1/header.s b/data/maps/EverGrandeCity_Corridor1/header.inc
index 68d16484e..68d16484e 100644
--- a/data/maps/EverGrandeCity_Corridor1/header.s
+++ b/data/maps/EverGrandeCity_Corridor1/header.inc
diff --git a/data/maps/EverGrandeCity_Corridor2/header.s b/data/maps/EverGrandeCity_Corridor2/header.inc
index 0dab21f9a..0dab21f9a 100644
--- a/data/maps/EverGrandeCity_Corridor2/header.s
+++ b/data/maps/EverGrandeCity_Corridor2/header.inc
diff --git a/data/maps/EverGrandeCity_Corridor3/header.s b/data/maps/EverGrandeCity_Corridor3/header.inc
index 3d20a6a41..3d20a6a41 100644
--- a/data/maps/EverGrandeCity_Corridor3/header.s
+++ b/data/maps/EverGrandeCity_Corridor3/header.inc
diff --git a/data/maps/EverGrandeCity_Corridor4/header.s b/data/maps/EverGrandeCity_Corridor4/header.inc
index 56a5297d7..56a5297d7 100644
--- a/data/maps/EverGrandeCity_Corridor4/header.s
+++ b/data/maps/EverGrandeCity_Corridor4/header.inc
diff --git a/data/maps/EverGrandeCity_Corridor5/header.s b/data/maps/EverGrandeCity_Corridor5/header.inc
index 2ca1fef86..2ca1fef86 100644
--- a/data/maps/EverGrandeCity_Corridor5/header.s
+++ b/data/maps/EverGrandeCity_Corridor5/header.inc
diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.s b/data/maps/EverGrandeCity_DrakesRoom/header.inc
index 04c1d9f32..04c1d9f32 100644
--- a/data/maps/EverGrandeCity_DrakesRoom/header.s
+++ b/data/maps/EverGrandeCity_DrakesRoom/header.inc
diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.s b/data/maps/EverGrandeCity_GlaciasRoom/header.inc
index e0a48f9a6..e0a48f9a6 100644
--- a/data/maps/EverGrandeCity_GlaciasRoom/header.s
+++ b/data/maps/EverGrandeCity_GlaciasRoom/header.inc
diff --git a/data/maps/EverGrandeCity_HallOfFame/header.s b/data/maps/EverGrandeCity_HallOfFame/header.inc
index b7816ea86..b7816ea86 100644
--- a/data/maps/EverGrandeCity_HallOfFame/header.s
+++ b/data/maps/EverGrandeCity_HallOfFame/header.inc
diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.s b/data/maps/EverGrandeCity_PhoebesRoom/header.inc
index f9ef5a516..f9ef5a516 100644
--- a/data/maps/EverGrandeCity_PhoebesRoom/header.s
+++ b/data/maps/EverGrandeCity_PhoebesRoom/header.inc
diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.s b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc
index 2b72fc661..2b72fc661 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.s
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc
diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/header.s b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc
index b60e3c3df..b60e3c3df 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.s
+++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc
diff --git a/data/maps/EverGrandeCity_PokemonLeague/header.s b/data/maps/EverGrandeCity_PokemonLeague/header.inc
index cf24b61dc..cf24b61dc 100644
--- a/data/maps/EverGrandeCity_PokemonLeague/header.s
+++ b/data/maps/EverGrandeCity_PokemonLeague/header.inc
diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.s b/data/maps/EverGrandeCity_SidneysRoom/header.inc
index 7c2ee11f8..7c2ee11f8 100644
--- a/data/maps/EverGrandeCity_SidneysRoom/header.s
+++ b/data/maps/EverGrandeCity_SidneysRoom/header.inc
diff --git a/data/maps/FallarborTown/connections.s b/data/maps/FallarborTown/connections.inc
index 259d5adf0..259d5adf0 100644
--- a/data/maps/FallarborTown/connections.s
+++ b/data/maps/FallarborTown/connections.inc
diff --git a/data/maps/FallarborTown/header.s b/data/maps/FallarborTown/header.inc
index bd719a36b..bd719a36b 100644
--- a/data/maps/FallarborTown/header.s
+++ b/data/maps/FallarborTown/header.inc
diff --git a/data/maps/FallarborTown_ContestHall/header.s b/data/maps/FallarborTown_ContestHall/header.inc
index aa540e338..aa540e338 100644
--- a/data/maps/FallarborTown_ContestHall/header.s
+++ b/data/maps/FallarborTown_ContestHall/header.inc
diff --git a/data/maps/FallarborTown_ContestLobby/header.s b/data/maps/FallarborTown_ContestLobby/header.inc
index 2f25d3675..2f25d3675 100644
--- a/data/maps/FallarborTown_ContestLobby/header.s
+++ b/data/maps/FallarborTown_ContestLobby/header.inc
diff --git a/data/maps/FallarborTown_House1/header.s b/data/maps/FallarborTown_House1/header.inc
index 2761536b6..2761536b6 100644
--- a/data/maps/FallarborTown_House1/header.s
+++ b/data/maps/FallarborTown_House1/header.inc
diff --git a/data/maps/FallarborTown_House2/header.s b/data/maps/FallarborTown_House2/header.inc
index 0366c201a..0366c201a 100644
--- a/data/maps/FallarborTown_House2/header.s
+++ b/data/maps/FallarborTown_House2/header.inc
diff --git a/data/maps/FallarborTown_Mart/header.s b/data/maps/FallarborTown_Mart/header.inc
index b60fa85c8..b60fa85c8 100644
--- a/data/maps/FallarborTown_Mart/header.s
+++ b/data/maps/FallarborTown_Mart/header.inc
diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.s b/data/maps/FallarborTown_PokemonCenter_1F/header.inc
index 8ffb95e0c..8ffb95e0c 100644
--- a/data/maps/FallarborTown_PokemonCenter_1F/header.s
+++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc
diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.s b/data/maps/FallarborTown_PokemonCenter_2F/header.inc
index 45120890d..45120890d 100644
--- a/data/maps/FallarborTown_PokemonCenter_2F/header.s
+++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc
diff --git a/data/maps/FieryPath/header.s b/data/maps/FieryPath/header.inc
index ccca2e656..ccca2e656 100644
--- a/data/maps/FieryPath/header.s
+++ b/data/maps/FieryPath/header.inc
diff --git a/data/maps/FortreeCity/connections.s b/data/maps/FortreeCity/connections.inc
index 3012973d8..3012973d8 100644
--- a/data/maps/FortreeCity/connections.s
+++ b/data/maps/FortreeCity/connections.inc
diff --git a/data/maps/FortreeCity/header.s b/data/maps/FortreeCity/header.inc
index 4c96de2b2..4c96de2b2 100644
--- a/data/maps/FortreeCity/header.s
+++ b/data/maps/FortreeCity/header.inc
diff --git a/data/maps/FortreeCity_DecorationShop/header.s b/data/maps/FortreeCity_DecorationShop/header.inc
index 5334ca92c..5334ca92c 100644
--- a/data/maps/FortreeCity_DecorationShop/header.s
+++ b/data/maps/FortreeCity_DecorationShop/header.inc
diff --git a/data/maps/FortreeCity_Gym/header.s b/data/maps/FortreeCity_Gym/header.inc
index 378a73b52..378a73b52 100644
--- a/data/maps/FortreeCity_Gym/header.s
+++ b/data/maps/FortreeCity_Gym/header.inc
diff --git a/data/maps/FortreeCity_House1/header.s b/data/maps/FortreeCity_House1/header.inc
index ad8198c43..ad8198c43 100644
--- a/data/maps/FortreeCity_House1/header.s
+++ b/data/maps/FortreeCity_House1/header.inc
diff --git a/data/maps/FortreeCity_House2/header.s b/data/maps/FortreeCity_House2/header.inc
index 3c803636b..3c803636b 100644
--- a/data/maps/FortreeCity_House2/header.s
+++ b/data/maps/FortreeCity_House2/header.inc
diff --git a/data/maps/FortreeCity_House3/header.s b/data/maps/FortreeCity_House3/header.inc
index 40bf85478..40bf85478 100644
--- a/data/maps/FortreeCity_House3/header.s
+++ b/data/maps/FortreeCity_House3/header.inc
diff --git a/data/maps/FortreeCity_House4/header.s b/data/maps/FortreeCity_House4/header.inc
index bed750ecb..bed750ecb 100644
--- a/data/maps/FortreeCity_House4/header.s
+++ b/data/maps/FortreeCity_House4/header.inc
diff --git a/data/maps/FortreeCity_House5/header.s b/data/maps/FortreeCity_House5/header.inc
index a8bb67d65..a8bb67d65 100644
--- a/data/maps/FortreeCity_House5/header.s
+++ b/data/maps/FortreeCity_House5/header.inc
diff --git a/data/maps/FortreeCity_Mart/header.s b/data/maps/FortreeCity_Mart/header.inc
index 4b8793d36..4b8793d36 100644
--- a/data/maps/FortreeCity_Mart/header.s
+++ b/data/maps/FortreeCity_Mart/header.inc
diff --git a/data/maps/FortreeCity_PokemonCenter_1F/header.s b/data/maps/FortreeCity_PokemonCenter_1F/header.inc
index fcafbe2af..fcafbe2af 100644
--- a/data/maps/FortreeCity_PokemonCenter_1F/header.s
+++ b/data/maps/FortreeCity_PokemonCenter_1F/header.inc
diff --git a/data/maps/FortreeCity_PokemonCenter_2F/header.s b/data/maps/FortreeCity_PokemonCenter_2F/header.inc
index 0421b7880..0421b7880 100644
--- a/data/maps/FortreeCity_PokemonCenter_2F/header.s
+++ b/data/maps/FortreeCity_PokemonCenter_2F/header.inc
diff --git a/data/maps/GraniteCave_1F/header.s b/data/maps/GraniteCave_1F/header.inc
index cf22ded8a..cf22ded8a 100644
--- a/data/maps/GraniteCave_1F/header.s
+++ b/data/maps/GraniteCave_1F/header.inc
diff --git a/data/maps/GraniteCave_B1F/header.s b/data/maps/GraniteCave_B1F/header.inc
index 654803312..654803312 100644
--- a/data/maps/GraniteCave_B1F/header.s
+++ b/data/maps/GraniteCave_B1F/header.inc
diff --git a/data/maps/GraniteCave_B2F/header.s b/data/maps/GraniteCave_B2F/header.inc
index 4d243f3da..4d243f3da 100644
--- a/data/maps/GraniteCave_B2F/header.s
+++ b/data/maps/GraniteCave_B2F/header.inc
diff --git a/data/maps/GraniteCave_StevensRoom/header.s b/data/maps/GraniteCave_StevensRoom/header.inc
index fb9b18436..fb9b18436 100644
--- a/data/maps/GraniteCave_StevensRoom/header.s
+++ b/data/maps/GraniteCave_StevensRoom/header.inc
diff --git a/data/maps/InsideOfTruck/header.s b/data/maps/InsideOfTruck/header.inc
index ee88d280d..ee88d280d 100644
--- a/data/maps/InsideOfTruck/header.s
+++ b/data/maps/InsideOfTruck/header.inc
diff --git a/data/maps/IslandCave/header.s b/data/maps/IslandCave/header.inc
index f811fe3da..f811fe3da 100644
--- a/data/maps/IslandCave/header.s
+++ b/data/maps/IslandCave/header.inc
diff --git a/data/maps/JaggedPass/header.s b/data/maps/JaggedPass/header.inc
index 6770756e8..6770756e8 100644
--- a/data/maps/JaggedPass/header.s
+++ b/data/maps/JaggedPass/header.inc
diff --git a/data/maps/LavaridgeTown/connections.s b/data/maps/LavaridgeTown/connections.inc
index b31155ae3..b31155ae3 100644
--- a/data/maps/LavaridgeTown/connections.s
+++ b/data/maps/LavaridgeTown/connections.inc
diff --git a/data/maps/LavaridgeTown/header.s b/data/maps/LavaridgeTown/header.inc
index e34eec863..e34eec863 100644
--- a/data/maps/LavaridgeTown/header.s
+++ b/data/maps/LavaridgeTown/header.inc
diff --git a/data/maps/LavaridgeTown_Gym_1F/header.s b/data/maps/LavaridgeTown_Gym_1F/header.inc
index 929b07ae7..929b07ae7 100644
--- a/data/maps/LavaridgeTown_Gym_1F/header.s
+++ b/data/maps/LavaridgeTown_Gym_1F/header.inc
diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.s b/data/maps/LavaridgeTown_Gym_B1F/header.inc
index d8a747789..d8a747789 100644
--- a/data/maps/LavaridgeTown_Gym_B1F/header.s
+++ b/data/maps/LavaridgeTown_Gym_B1F/header.inc
diff --git a/data/maps/LavaridgeTown_HerbShop/header.s b/data/maps/LavaridgeTown_HerbShop/header.inc
index f44118c5c..f44118c5c 100644
--- a/data/maps/LavaridgeTown_HerbShop/header.s
+++ b/data/maps/LavaridgeTown_HerbShop/header.inc
diff --git a/data/maps/LavaridgeTown_House/header.s b/data/maps/LavaridgeTown_House/header.inc
index f43ea0bc4..f43ea0bc4 100644
--- a/data/maps/LavaridgeTown_House/header.s
+++ b/data/maps/LavaridgeTown_House/header.inc
diff --git a/data/maps/LavaridgeTown_Mart/header.s b/data/maps/LavaridgeTown_Mart/header.inc
index 0882a6bf0..0882a6bf0 100644
--- a/data/maps/LavaridgeTown_Mart/header.s
+++ b/data/maps/LavaridgeTown_Mart/header.inc
diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/header.s b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc
index 78576d740..78576d740 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.s
+++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc
diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/header.s b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc
index 3d86fa588..3d86fa588 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.s
+++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc
diff --git a/data/maps/LilycoveCity/connections.s b/data/maps/LilycoveCity/connections.inc
index a476e2de2..a476e2de2 100644
--- a/data/maps/LilycoveCity/connections.s
+++ b/data/maps/LilycoveCity/connections.inc
diff --git a/data/maps/LilycoveCity/header.s b/data/maps/LilycoveCity/header.inc
index 204e2098d..204e2098d 100644
--- a/data/maps/LilycoveCity/header.s
+++ b/data/maps/LilycoveCity/header.inc
diff --git a/data/maps/LilycoveCity_ContestHall/header.s b/data/maps/LilycoveCity_ContestHall/header.inc
index 47329e0f7..47329e0f7 100644
--- a/data/maps/LilycoveCity_ContestHall/header.s
+++ b/data/maps/LilycoveCity_ContestHall/header.inc
diff --git a/data/maps/LilycoveCity_ContestLobby/header.s b/data/maps/LilycoveCity_ContestLobby/header.inc
index 5bf98a32b..5bf98a32b 100644
--- a/data/maps/LilycoveCity_ContestLobby/header.s
+++ b/data/maps/LilycoveCity_ContestLobby/header.inc
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.s b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc
index 141fda863..141fda863 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.s
+++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.s b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc
index 2d6f9de4b..2d6f9de4b 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.s
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc
diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.s b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc
index 3f1a8ada9..3f1a8ada9 100644
--- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.s
+++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc
diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.s b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc
index 292c621d3..292c621d3 100644
--- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.s
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc
diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/header.s b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc
index ecfb77604..ecfb77604 100644
--- a/data/maps/LilycoveCity_DepartmentStore_1F/header.s
+++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc
diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/header.s b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc
index f10428935..f10428935 100644
--- a/data/maps/LilycoveCity_DepartmentStore_2F/header.s
+++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc
diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/header.s b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc
index 16f453da0..16f453da0 100644
--- a/data/maps/LilycoveCity_DepartmentStore_3F/header.s
+++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc
diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/header.s b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc
index 169f21d92..169f21d92 100644
--- a/data/maps/LilycoveCity_DepartmentStore_4F/header.s
+++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc
diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/header.s b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc
index 19b45696c..19b45696c 100644
--- a/data/maps/LilycoveCity_DepartmentStore_5F/header.s
+++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc
diff --git a/data/maps/LilycoveCity_EmptyMap/header.s b/data/maps/LilycoveCity_EmptyMap/header.inc
index a83e7139d..a83e7139d 100644
--- a/data/maps/LilycoveCity_EmptyMap/header.s
+++ b/data/maps/LilycoveCity_EmptyMap/header.inc
diff --git a/data/maps/LilycoveCity_Harbor/header.s b/data/maps/LilycoveCity_Harbor/header.inc
index 022eb0356..022eb0356 100644
--- a/data/maps/LilycoveCity_Harbor/header.s
+++ b/data/maps/LilycoveCity_Harbor/header.inc
diff --git a/data/maps/LilycoveCity_House1/header.s b/data/maps/LilycoveCity_House1/header.inc
index 5cfc8540b..5cfc8540b 100644
--- a/data/maps/LilycoveCity_House1/header.s
+++ b/data/maps/LilycoveCity_House1/header.inc
diff --git a/data/maps/LilycoveCity_House2/header.s b/data/maps/LilycoveCity_House2/header.inc
index 8aac9185c..8aac9185c 100644
--- a/data/maps/LilycoveCity_House2/header.s
+++ b/data/maps/LilycoveCity_House2/header.inc
diff --git a/data/maps/LilycoveCity_House3/header.s b/data/maps/LilycoveCity_House3/header.inc
index 599e904d5..599e904d5 100644
--- a/data/maps/LilycoveCity_House3/header.s
+++ b/data/maps/LilycoveCity_House3/header.inc
diff --git a/data/maps/LilycoveCity_House4/header.s b/data/maps/LilycoveCity_House4/header.inc
index d9cd2c7f0..d9cd2c7f0 100644
--- a/data/maps/LilycoveCity_House4/header.s
+++ b/data/maps/LilycoveCity_House4/header.inc
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.s b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc
index d48ffc94f..d48ffc94f 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.s
+++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.s b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc
index 460ed87f9..460ed87f9 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.s
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc
diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.s b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc
index bcfc3435f..bcfc3435f 100644
--- a/data/maps/LilycoveCity_MoveDeletersHouse/header.s
+++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc
diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.s b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc
index a1eb040ae..a1eb040ae 100644
--- a/data/maps/LilycoveCity_PokemonCenter_1F/header.s
+++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc
diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/header.s b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc
index 341ce8590..341ce8590 100644
--- a/data/maps/LilycoveCity_PokemonCenter_2F/header.s
+++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.s b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc
index 4e75b2193..4e75b2193 100644
--- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.s
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc
diff --git a/data/maps/LilycoveCity_UnusedMart/header.s b/data/maps/LilycoveCity_UnusedMart/header.inc
index 43137d33b..43137d33b 100644
--- a/data/maps/LilycoveCity_UnusedMart/header.s
+++ b/data/maps/LilycoveCity_UnusedMart/header.inc
diff --git a/data/maps/LinkContestRoom1/header.s b/data/maps/LinkContestRoom1/header.inc
index 9e265d9c9..9e265d9c9 100644
--- a/data/maps/LinkContestRoom1/header.s
+++ b/data/maps/LinkContestRoom1/header.inc
diff --git a/data/maps/LinkContestRoom2/header.s b/data/maps/LinkContestRoom2/header.inc
index f492eab03..f492eab03 100644
--- a/data/maps/LinkContestRoom2/header.s
+++ b/data/maps/LinkContestRoom2/header.inc
diff --git a/data/maps/LinkContestRoom3/header.s b/data/maps/LinkContestRoom3/header.inc
index 90de4491d..90de4491d 100644
--- a/data/maps/LinkContestRoom3/header.s
+++ b/data/maps/LinkContestRoom3/header.inc
diff --git a/data/maps/LinkContestRoom4/header.s b/data/maps/LinkContestRoom4/header.inc
index 774e55abc..774e55abc 100644
--- a/data/maps/LinkContestRoom4/header.s
+++ b/data/maps/LinkContestRoom4/header.inc
diff --git a/data/maps/LinkContestRoom5/header.s b/data/maps/LinkContestRoom5/header.inc
index 22b90f6c9..22b90f6c9 100644
--- a/data/maps/LinkContestRoom5/header.s
+++ b/data/maps/LinkContestRoom5/header.inc
diff --git a/data/maps/LinkContestRoom6/header.s b/data/maps/LinkContestRoom6/header.inc
index 773912080..773912080 100644
--- a/data/maps/LinkContestRoom6/header.s
+++ b/data/maps/LinkContestRoom6/header.inc
diff --git a/data/maps/LittlerootTown/connections.s b/data/maps/LittlerootTown/connections.inc
index d045d04d7..d045d04d7 100644
--- a/data/maps/LittlerootTown/connections.s
+++ b/data/maps/LittlerootTown/connections.inc
diff --git a/data/maps/LittlerootTown/header.s b/data/maps/LittlerootTown/header.inc
index 5493f6005..5493f6005 100644
--- a/data/maps/LittlerootTown/header.s
+++ b/data/maps/LittlerootTown/header.inc
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.s b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc
index 122fdc82a..122fdc82a 100644
--- a/data/maps/LittlerootTown_BrendansHouse_1F/header.s
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc
diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/header.s b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc
index 449a883cb..449a883cb 100644
--- a/data/maps/LittlerootTown_BrendansHouse_2F/header.s
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.s b/data/maps/LittlerootTown_MaysHouse_1F/header.inc
index 6d6220086..6d6220086 100644
--- a/data/maps/LittlerootTown_MaysHouse_1F/header.s
+++ b/data/maps/LittlerootTown_MaysHouse_1F/header.inc
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/header.s b/data/maps/LittlerootTown_MaysHouse_2F/header.inc
index 44859dd4c..44859dd4c 100644
--- a/data/maps/LittlerootTown_MaysHouse_2F/header.s
+++ b/data/maps/LittlerootTown_MaysHouse_2F/header.inc
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.s b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc
index 31fb03c64..31fb03c64 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.s
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc
diff --git a/data/maps/MagmaHideout_1F/header.s b/data/maps/MagmaHideout_1F/header.inc
index 3876e17ec..3876e17ec 100644
--- a/data/maps/MagmaHideout_1F/header.s
+++ b/data/maps/MagmaHideout_1F/header.inc
diff --git a/data/maps/MagmaHideout_B1F/header.s b/data/maps/MagmaHideout_B1F/header.inc
index 16fe3f2ba..16fe3f2ba 100644
--- a/data/maps/MagmaHideout_B1F/header.s
+++ b/data/maps/MagmaHideout_B1F/header.inc
diff --git a/data/maps/MagmaHideout_B2F/header.s b/data/maps/MagmaHideout_B2F/header.inc
index 3aee695b4..3aee695b4 100644
--- a/data/maps/MagmaHideout_B2F/header.s
+++ b/data/maps/MagmaHideout_B2F/header.inc
diff --git a/data/maps/MauvilleCity/connections.s b/data/maps/MauvilleCity/connections.inc
index 07f3649cd..07f3649cd 100644
--- a/data/maps/MauvilleCity/connections.s
+++ b/data/maps/MauvilleCity/connections.inc
diff --git a/data/maps/MauvilleCity/header.s b/data/maps/MauvilleCity/header.inc
index e0e2c4f22..e0e2c4f22 100644
--- a/data/maps/MauvilleCity/header.s
+++ b/data/maps/MauvilleCity/header.inc
diff --git a/data/maps/MauvilleCity_BikeShop/header.s b/data/maps/MauvilleCity_BikeShop/header.inc
index c99124794..c99124794 100644
--- a/data/maps/MauvilleCity_BikeShop/header.s
+++ b/data/maps/MauvilleCity_BikeShop/header.inc
diff --git a/data/maps/MauvilleCity_GameCorner/header.s b/data/maps/MauvilleCity_GameCorner/header.inc
index 653a41544..653a41544 100644
--- a/data/maps/MauvilleCity_GameCorner/header.s
+++ b/data/maps/MauvilleCity_GameCorner/header.inc
diff --git a/data/maps/MauvilleCity_Gym/header.s b/data/maps/MauvilleCity_Gym/header.inc
index efbd61fe0..efbd61fe0 100644
--- a/data/maps/MauvilleCity_Gym/header.s
+++ b/data/maps/MauvilleCity_Gym/header.inc
diff --git a/data/maps/MauvilleCity_House1/header.s b/data/maps/MauvilleCity_House1/header.inc
index 30c59da1e..30c59da1e 100644
--- a/data/maps/MauvilleCity_House1/header.s
+++ b/data/maps/MauvilleCity_House1/header.inc
diff --git a/data/maps/MauvilleCity_House2/header.s b/data/maps/MauvilleCity_House2/header.inc
index 9bd7d9c11..9bd7d9c11 100644
--- a/data/maps/MauvilleCity_House2/header.s
+++ b/data/maps/MauvilleCity_House2/header.inc
diff --git a/data/maps/MauvilleCity_Mart/header.s b/data/maps/MauvilleCity_Mart/header.inc
index 7712e16df..7712e16df 100644
--- a/data/maps/MauvilleCity_Mart/header.s
+++ b/data/maps/MauvilleCity_Mart/header.inc
diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.s b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc
index b6e0a1628..b6e0a1628 100644
--- a/data/maps/MauvilleCity_PokemonCenter_1F/header.s
+++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc
diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/header.s b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc
index 8787c975e..8787c975e 100644
--- a/data/maps/MauvilleCity_PokemonCenter_2F/header.s
+++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc
diff --git a/data/maps/MeteorFalls_1F_1R/header.s b/data/maps/MeteorFalls_1F_1R/header.inc
index dcb3fbbde..dcb3fbbde 100644
--- a/data/maps/MeteorFalls_1F_1R/header.s
+++ b/data/maps/MeteorFalls_1F_1R/header.inc
diff --git a/data/maps/MeteorFalls_1F_2R/header.s b/data/maps/MeteorFalls_1F_2R/header.inc
index 0d9d797aa..0d9d797aa 100644
--- a/data/maps/MeteorFalls_1F_2R/header.s
+++ b/data/maps/MeteorFalls_1F_2R/header.inc
diff --git a/data/maps/MeteorFalls_B1F_1R/header.s b/data/maps/MeteorFalls_B1F_1R/header.inc
index f67ab9ea7..f67ab9ea7 100644
--- a/data/maps/MeteorFalls_B1F_1R/header.s
+++ b/data/maps/MeteorFalls_B1F_1R/header.inc
diff --git a/data/maps/MeteorFalls_B1F_2R/header.s b/data/maps/MeteorFalls_B1F_2R/header.inc
index 779e6d23a..779e6d23a 100644
--- a/data/maps/MeteorFalls_B1F_2R/header.s
+++ b/data/maps/MeteorFalls_B1F_2R/header.inc
diff --git a/data/maps/MossdeepCity/connections.s b/data/maps/MossdeepCity/connections.inc
index 0e654d9cc..0e654d9cc 100644
--- a/data/maps/MossdeepCity/connections.s
+++ b/data/maps/MossdeepCity/connections.inc
diff --git a/data/maps/MossdeepCity/header.s b/data/maps/MossdeepCity/header.inc
index 26b3e1db0..26b3e1db0 100644
--- a/data/maps/MossdeepCity/header.s
+++ b/data/maps/MossdeepCity/header.inc
diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.s b/data/maps/MossdeepCity_GameCorner_1F/header.inc
index d96d383ea..d96d383ea 100644
--- a/data/maps/MossdeepCity_GameCorner_1F/header.s
+++ b/data/maps/MossdeepCity_GameCorner_1F/header.inc
diff --git a/data/maps/MossdeepCity_GameCorner_B1F/header.s b/data/maps/MossdeepCity_GameCorner_B1F/header.inc
index 7692281f0..7692281f0 100644
--- a/data/maps/MossdeepCity_GameCorner_B1F/header.s
+++ b/data/maps/MossdeepCity_GameCorner_B1F/header.inc
diff --git a/data/maps/MossdeepCity_Gym/header.s b/data/maps/MossdeepCity_Gym/header.inc
index b72bdf62e..b72bdf62e 100644
--- a/data/maps/MossdeepCity_Gym/header.s
+++ b/data/maps/MossdeepCity_Gym/header.inc
diff --git a/data/maps/MossdeepCity_House1/header.s b/data/maps/MossdeepCity_House1/header.inc
index 70f681e7a..70f681e7a 100644
--- a/data/maps/MossdeepCity_House1/header.s
+++ b/data/maps/MossdeepCity_House1/header.inc
diff --git a/data/maps/MossdeepCity_House2/header.s b/data/maps/MossdeepCity_House2/header.inc
index 62bd6bdec..62bd6bdec 100644
--- a/data/maps/MossdeepCity_House2/header.s
+++ b/data/maps/MossdeepCity_House2/header.inc
diff --git a/data/maps/MossdeepCity_House3/header.s b/data/maps/MossdeepCity_House3/header.inc
index 54c6641b6..54c6641b6 100644
--- a/data/maps/MossdeepCity_House3/header.s
+++ b/data/maps/MossdeepCity_House3/header.inc
diff --git a/data/maps/MossdeepCity_House4/header.s b/data/maps/MossdeepCity_House4/header.inc
index 1c0e433bb..1c0e433bb 100644
--- a/data/maps/MossdeepCity_House4/header.s
+++ b/data/maps/MossdeepCity_House4/header.inc
diff --git a/data/maps/MossdeepCity_Mart/header.s b/data/maps/MossdeepCity_Mart/header.inc
index c18fca0e3..c18fca0e3 100644
--- a/data/maps/MossdeepCity_Mart/header.s
+++ b/data/maps/MossdeepCity_Mart/header.inc
diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/header.s b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc
index 036604eff..036604eff 100644
--- a/data/maps/MossdeepCity_PokemonCenter_1F/header.s
+++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc
diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/header.s b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc
index cb42c5c80..cb42c5c80 100644
--- a/data/maps/MossdeepCity_PokemonCenter_2F/header.s
+++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc
diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/header.s b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc
index 65ba897fb..65ba897fb 100644
--- a/data/maps/MossdeepCity_SpaceCenter_1F/header.s
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/header.s b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc
index 2195ee8e2..2195ee8e2 100644
--- a/data/maps/MossdeepCity_SpaceCenter_2F/header.s
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc
diff --git a/data/maps/MossdeepCity_StevensHouse/header.s b/data/maps/MossdeepCity_StevensHouse/header.inc
index 761ea9b73..761ea9b73 100644
--- a/data/maps/MossdeepCity_StevensHouse/header.s
+++ b/data/maps/MossdeepCity_StevensHouse/header.inc
diff --git a/data/maps/MtChimney/header.s b/data/maps/MtChimney/header.inc
index cdc29ce7f..cdc29ce7f 100644
--- a/data/maps/MtChimney/header.s
+++ b/data/maps/MtChimney/header.inc
diff --git a/data/maps/MtChimney_CableCarStation/header.s b/data/maps/MtChimney_CableCarStation/header.inc
index f5207578b..f5207578b 100644
--- a/data/maps/MtChimney_CableCarStation/header.s
+++ b/data/maps/MtChimney_CableCarStation/header.inc
diff --git a/data/maps/MtPyre_1F/header.s b/data/maps/MtPyre_1F/header.inc
index cfdff9591..cfdff9591 100644
--- a/data/maps/MtPyre_1F/header.s
+++ b/data/maps/MtPyre_1F/header.inc
diff --git a/data/maps/MtPyre_2F/header.s b/data/maps/MtPyre_2F/header.inc
index 914fdabd4..914fdabd4 100644
--- a/data/maps/MtPyre_2F/header.s
+++ b/data/maps/MtPyre_2F/header.inc
diff --git a/data/maps/MtPyre_3F/header.s b/data/maps/MtPyre_3F/header.inc
index b4a59adbd..b4a59adbd 100644
--- a/data/maps/MtPyre_3F/header.s
+++ b/data/maps/MtPyre_3F/header.inc
diff --git a/data/maps/MtPyre_4F/header.s b/data/maps/MtPyre_4F/header.inc
index 8dcbd4e64..8dcbd4e64 100644
--- a/data/maps/MtPyre_4F/header.s
+++ b/data/maps/MtPyre_4F/header.inc
diff --git a/data/maps/MtPyre_5F/header.s b/data/maps/MtPyre_5F/header.inc
index 0eb7f7bba..0eb7f7bba 100644
--- a/data/maps/MtPyre_5F/header.s
+++ b/data/maps/MtPyre_5F/header.inc
diff --git a/data/maps/MtPyre_6F/header.s b/data/maps/MtPyre_6F/header.inc
index 3cab722cd..3cab722cd 100644
--- a/data/maps/MtPyre_6F/header.s
+++ b/data/maps/MtPyre_6F/header.inc
diff --git a/data/maps/MtPyre_Exterior/header.s b/data/maps/MtPyre_Exterior/header.inc
index 543e090f0..543e090f0 100644
--- a/data/maps/MtPyre_Exterior/header.s
+++ b/data/maps/MtPyre_Exterior/header.inc
diff --git a/data/maps/MtPyre_Summit/header.s b/data/maps/MtPyre_Summit/header.inc
index e07d849a6..e07d849a6 100644
--- a/data/maps/MtPyre_Summit/header.s
+++ b/data/maps/MtPyre_Summit/header.inc
diff --git a/data/maps/NewMauville_Entrance/header.s b/data/maps/NewMauville_Entrance/header.inc
index 28ac26ccf..28ac26ccf 100644
--- a/data/maps/NewMauville_Entrance/header.s
+++ b/data/maps/NewMauville_Entrance/header.inc
diff --git a/data/maps/NewMauville_Inside/header.s b/data/maps/NewMauville_Inside/header.inc
index 9771d7ec7..9771d7ec7 100644
--- a/data/maps/NewMauville_Inside/header.s
+++ b/data/maps/NewMauville_Inside/header.inc
diff --git a/data/maps/OldaleTown/connections.s b/data/maps/OldaleTown/connections.inc
index fc5495101..fc5495101 100644
--- a/data/maps/OldaleTown/connections.s
+++ b/data/maps/OldaleTown/connections.inc
diff --git a/data/maps/OldaleTown/header.s b/data/maps/OldaleTown/header.inc
index 22965da3d..22965da3d 100644
--- a/data/maps/OldaleTown/header.s
+++ b/data/maps/OldaleTown/header.inc
diff --git a/data/maps/OldaleTown_House1/header.s b/data/maps/OldaleTown_House1/header.inc
index 550ff5a75..550ff5a75 100644
--- a/data/maps/OldaleTown_House1/header.s
+++ b/data/maps/OldaleTown_House1/header.inc
diff --git a/data/maps/OldaleTown_House2/header.s b/data/maps/OldaleTown_House2/header.inc
index eb1660cf9..eb1660cf9 100644
--- a/data/maps/OldaleTown_House2/header.s
+++ b/data/maps/OldaleTown_House2/header.inc
diff --git a/data/maps/OldaleTown_Mart/header.s b/data/maps/OldaleTown_Mart/header.inc
index a0e8a8851..a0e8a8851 100644
--- a/data/maps/OldaleTown_Mart/header.s
+++ b/data/maps/OldaleTown_Mart/header.inc
diff --git a/data/maps/OldaleTown_PokemonCenter_1F/header.s b/data/maps/OldaleTown_PokemonCenter_1F/header.inc
index 82ced7328..82ced7328 100644
--- a/data/maps/OldaleTown_PokemonCenter_1F/header.s
+++ b/data/maps/OldaleTown_PokemonCenter_1F/header.inc
diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.s b/data/maps/OldaleTown_PokemonCenter_2F/header.inc
index 79e6ca99d..79e6ca99d 100644
--- a/data/maps/OldaleTown_PokemonCenter_2F/header.s
+++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc
diff --git a/data/maps/PacifidlogTown/connections.s b/data/maps/PacifidlogTown/connections.inc
index 3c0ae1a62..3c0ae1a62 100644
--- a/data/maps/PacifidlogTown/connections.s
+++ b/data/maps/PacifidlogTown/connections.inc
diff --git a/data/maps/PacifidlogTown/header.s b/data/maps/PacifidlogTown/header.inc
index 057e83264..057e83264 100644
--- a/data/maps/PacifidlogTown/header.s
+++ b/data/maps/PacifidlogTown/header.inc
diff --git a/data/maps/PacifidlogTown_House1/header.s b/data/maps/PacifidlogTown_House1/header.inc
index 7842574f9..7842574f9 100644
--- a/data/maps/PacifidlogTown_House1/header.s
+++ b/data/maps/PacifidlogTown_House1/header.inc
diff --git a/data/maps/PacifidlogTown_House2/header.s b/data/maps/PacifidlogTown_House2/header.inc
index 3fc2aba99..3fc2aba99 100644
--- a/data/maps/PacifidlogTown_House2/header.s
+++ b/data/maps/PacifidlogTown_House2/header.inc
diff --git a/data/maps/PacifidlogTown_House3/header.s b/data/maps/PacifidlogTown_House3/header.inc
index 6bf1e6bd6..6bf1e6bd6 100644
--- a/data/maps/PacifidlogTown_House3/header.s
+++ b/data/maps/PacifidlogTown_House3/header.inc
diff --git a/data/maps/PacifidlogTown_House4/header.s b/data/maps/PacifidlogTown_House4/header.inc
index df930a533..df930a533 100644
--- a/data/maps/PacifidlogTown_House4/header.s
+++ b/data/maps/PacifidlogTown_House4/header.inc
diff --git a/data/maps/PacifidlogTown_House5/header.s b/data/maps/PacifidlogTown_House5/header.inc
index d0fca156f..d0fca156f 100644
--- a/data/maps/PacifidlogTown_House5/header.s
+++ b/data/maps/PacifidlogTown_House5/header.inc
diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/header.s b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc
index ef2ddbf4c..ef2ddbf4c 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.s
+++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc
diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/header.s b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc
index b985545a8..b985545a8 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.s
+++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc
diff --git a/data/maps/PetalburgCity/connections.s b/data/maps/PetalburgCity/connections.inc
index cabded017..cabded017 100644
--- a/data/maps/PetalburgCity/connections.s
+++ b/data/maps/PetalburgCity/connections.inc
diff --git a/data/maps/PetalburgCity/header.s b/data/maps/PetalburgCity/header.inc
index c1706a55a..c1706a55a 100644
--- a/data/maps/PetalburgCity/header.s
+++ b/data/maps/PetalburgCity/header.inc
diff --git a/data/maps/PetalburgCity_Gym/header.s b/data/maps/PetalburgCity_Gym/header.inc
index af00ed5f0..af00ed5f0 100644
--- a/data/maps/PetalburgCity_Gym/header.s
+++ b/data/maps/PetalburgCity_Gym/header.inc
diff --git a/data/maps/PetalburgCity_House1/header.s b/data/maps/PetalburgCity_House1/header.inc
index e1f5c1f63..e1f5c1f63 100644
--- a/data/maps/PetalburgCity_House1/header.s
+++ b/data/maps/PetalburgCity_House1/header.inc
diff --git a/data/maps/PetalburgCity_House2/header.s b/data/maps/PetalburgCity_House2/header.inc
index fb76b1bfe..fb76b1bfe 100644
--- a/data/maps/PetalburgCity_House2/header.s
+++ b/data/maps/PetalburgCity_House2/header.inc
diff --git a/data/maps/PetalburgCity_Mart/header.s b/data/maps/PetalburgCity_Mart/header.inc
index 56275cfaf..56275cfaf 100644
--- a/data/maps/PetalburgCity_Mart/header.s
+++ b/data/maps/PetalburgCity_Mart/header.inc
diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/header.s b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc
index 2596fb65d..2596fb65d 100644
--- a/data/maps/PetalburgCity_PokemonCenter_1F/header.s
+++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc
diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/header.s b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc
index ac6c77b6a..ac6c77b6a 100644
--- a/data/maps/PetalburgCity_PokemonCenter_2F/header.s
+++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc
diff --git a/data/maps/PetalburgCity_WallysHouse/header.s b/data/maps/PetalburgCity_WallysHouse/header.inc
index e16ac5a7f..e16ac5a7f 100644
--- a/data/maps/PetalburgCity_WallysHouse/header.s
+++ b/data/maps/PetalburgCity_WallysHouse/header.inc
diff --git a/data/maps/PetalburgWoods/header.s b/data/maps/PetalburgWoods/header.inc
index b3a981af9..b3a981af9 100644
--- a/data/maps/PetalburgWoods/header.s
+++ b/data/maps/PetalburgWoods/header.inc
diff --git a/data/maps/RecordCorner/header.s b/data/maps/RecordCorner/header.inc
index a8322ebee..a8322ebee 100644
--- a/data/maps/RecordCorner/header.s
+++ b/data/maps/RecordCorner/header.inc
diff --git a/data/maps/Route101/connections.s b/data/maps/Route101/connections.inc
index 78f73238b..78f73238b 100644
--- a/data/maps/Route101/connections.s
+++ b/data/maps/Route101/connections.inc
diff --git a/data/maps/Route101/header.s b/data/maps/Route101/header.inc
index 1b4b6b1c4..1b4b6b1c4 100644
--- a/data/maps/Route101/header.s
+++ b/data/maps/Route101/header.inc
diff --git a/data/maps/Route102/connections.s b/data/maps/Route102/connections.inc
index c132f5fa7..c132f5fa7 100644
--- a/data/maps/Route102/connections.s
+++ b/data/maps/Route102/connections.inc
diff --git a/data/maps/Route102/header.s b/data/maps/Route102/header.inc
index a4318e2d2..a4318e2d2 100644
--- a/data/maps/Route102/header.s
+++ b/data/maps/Route102/header.inc
diff --git a/data/maps/Route103/connections.s b/data/maps/Route103/connections.inc
index 1510b33d2..1510b33d2 100644
--- a/data/maps/Route103/connections.s
+++ b/data/maps/Route103/connections.inc
diff --git a/data/maps/Route103/header.s b/data/maps/Route103/header.inc
index b23f9d523..b23f9d523 100644
--- a/data/maps/Route103/header.s
+++ b/data/maps/Route103/header.inc
diff --git a/data/maps/Route104/connections.s b/data/maps/Route104/connections.inc
index 38085d1a8..38085d1a8 100644
--- a/data/maps/Route104/connections.s
+++ b/data/maps/Route104/connections.inc
diff --git a/data/maps/Route104/header.s b/data/maps/Route104/header.inc
index 71e7059b5..71e7059b5 100644
--- a/data/maps/Route104/header.s
+++ b/data/maps/Route104/header.inc
diff --git a/data/maps/Route104_MrBrineysHouse/header.s b/data/maps/Route104_MrBrineysHouse/header.inc
index 3055a73d6..3055a73d6 100644
--- a/data/maps/Route104_MrBrineysHouse/header.s
+++ b/data/maps/Route104_MrBrineysHouse/header.inc
diff --git a/data/maps/Route104_PrettyPetalFlowerShop/header.s b/data/maps/Route104_PrettyPetalFlowerShop/header.inc
index 3dae6a068..3dae6a068 100644
--- a/data/maps/Route104_PrettyPetalFlowerShop/header.s
+++ b/data/maps/Route104_PrettyPetalFlowerShop/header.inc
diff --git a/data/maps/Route104_Prototype/header.s b/data/maps/Route104_Prototype/header.inc
index 7f5115386..7f5115386 100644
--- a/data/maps/Route104_Prototype/header.s
+++ b/data/maps/Route104_Prototype/header.inc
diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.s b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc
index 51b27eb0a..51b27eb0a 100644
--- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.s
+++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc
diff --git a/data/maps/Route105/connections.s b/data/maps/Route105/connections.inc
index 6915b9d08..6915b9d08 100644
--- a/data/maps/Route105/connections.s
+++ b/data/maps/Route105/connections.inc
diff --git a/data/maps/Route105/header.s b/data/maps/Route105/header.inc
index 344b8f634..344b8f634 100644
--- a/data/maps/Route105/header.s
+++ b/data/maps/Route105/header.inc
diff --git a/data/maps/Route106/connections.s b/data/maps/Route106/connections.inc
index 4d041e65c..4d041e65c 100644
--- a/data/maps/Route106/connections.s
+++ b/data/maps/Route106/connections.inc
diff --git a/data/maps/Route106/header.s b/data/maps/Route106/header.inc
index 494690340..494690340 100644
--- a/data/maps/Route106/header.s
+++ b/data/maps/Route106/header.inc
diff --git a/data/maps/Route107/connections.s b/data/maps/Route107/connections.inc
index a3da84672..a3da84672 100644
--- a/data/maps/Route107/connections.s
+++ b/data/maps/Route107/connections.inc
diff --git a/data/maps/Route107/header.s b/data/maps/Route107/header.inc
index 382b617ba..382b617ba 100644
--- a/data/maps/Route107/header.s
+++ b/data/maps/Route107/header.inc
diff --git a/data/maps/Route108/connections.s b/data/maps/Route108/connections.inc
index aba43d804..aba43d804 100644
--- a/data/maps/Route108/connections.s
+++ b/data/maps/Route108/connections.inc
diff --git a/data/maps/Route108/header.s b/data/maps/Route108/header.inc
index 3214f7b89..3214f7b89 100644
--- a/data/maps/Route108/header.s
+++ b/data/maps/Route108/header.inc
diff --git a/data/maps/Route109/connections.s b/data/maps/Route109/connections.inc
index 5135e8e8b..5135e8e8b 100644
--- a/data/maps/Route109/connections.s
+++ b/data/maps/Route109/connections.inc
diff --git a/data/maps/Route109/header.s b/data/maps/Route109/header.inc
index db91d1368..db91d1368 100644
--- a/data/maps/Route109/header.s
+++ b/data/maps/Route109/header.inc
diff --git a/data/maps/Route109_SeashoreHouse/header.s b/data/maps/Route109_SeashoreHouse/header.inc
index 064d428bd..064d428bd 100644
--- a/data/maps/Route109_SeashoreHouse/header.s
+++ b/data/maps/Route109_SeashoreHouse/header.inc
diff --git a/data/maps/Route110/connections.s b/data/maps/Route110/connections.inc
index d0f88deb3..d0f88deb3 100644
--- a/data/maps/Route110/connections.s
+++ b/data/maps/Route110/connections.inc
diff --git a/data/maps/Route110/header.s b/data/maps/Route110/header.inc
index 442a02ccb..442a02ccb 100644
--- a/data/maps/Route110/header.s
+++ b/data/maps/Route110/header.inc
diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.s b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc
index 749ab18e9..749ab18e9 100644
--- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.s
+++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc
diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.s b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc
index a4bd0cbd7..a4bd0cbd7 100644
--- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.s
+++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc
diff --git a/data/maps/Route110_TrickHouseCorridor/header.s b/data/maps/Route110_TrickHouseCorridor/header.inc
index f2b2c691d..f2b2c691d 100644
--- a/data/maps/Route110_TrickHouseCorridor/header.s
+++ b/data/maps/Route110_TrickHouseCorridor/header.inc
diff --git a/data/maps/Route110_TrickHouseEnd/header.s b/data/maps/Route110_TrickHouseEnd/header.inc
index d61808d7f..d61808d7f 100644
--- a/data/maps/Route110_TrickHouseEnd/header.s
+++ b/data/maps/Route110_TrickHouseEnd/header.inc
diff --git a/data/maps/Route110_TrickHouseEntrance/header.s b/data/maps/Route110_TrickHouseEntrance/header.inc
index 80d6c597f..80d6c597f 100644
--- a/data/maps/Route110_TrickHouseEntrance/header.s
+++ b/data/maps/Route110_TrickHouseEntrance/header.inc
diff --git a/data/maps/Route110_TrickHousePuzzle1/header.s b/data/maps/Route110_TrickHousePuzzle1/header.inc
index c4c87877c..c4c87877c 100644
--- a/data/maps/Route110_TrickHousePuzzle1/header.s
+++ b/data/maps/Route110_TrickHousePuzzle1/header.inc
diff --git a/data/maps/Route110_TrickHousePuzzle2/header.s b/data/maps/Route110_TrickHousePuzzle2/header.inc
index d278ca3aa..d278ca3aa 100644
--- a/data/maps/Route110_TrickHousePuzzle2/header.s
+++ b/data/maps/Route110_TrickHousePuzzle2/header.inc
diff --git a/data/maps/Route110_TrickHousePuzzle3/header.s b/data/maps/Route110_TrickHousePuzzle3/header.inc
index 736a1dc19..736a1dc19 100644
--- a/data/maps/Route110_TrickHousePuzzle3/header.s
+++ b/data/maps/Route110_TrickHousePuzzle3/header.inc
diff --git a/data/maps/Route110_TrickHousePuzzle4/header.s b/data/maps/Route110_TrickHousePuzzle4/header.inc
index f4117a578..f4117a578 100644
--- a/data/maps/Route110_TrickHousePuzzle4/header.s
+++ b/data/maps/Route110_TrickHousePuzzle4/header.inc
diff --git a/data/maps/Route110_TrickHousePuzzle5/header.s b/data/maps/Route110_TrickHousePuzzle5/header.inc
index 7216f556e..7216f556e 100644
--- a/data/maps/Route110_TrickHousePuzzle5/header.s
+++ b/data/maps/Route110_TrickHousePuzzle5/header.inc
diff --git a/data/maps/Route110_TrickHousePuzzle6/header.s b/data/maps/Route110_TrickHousePuzzle6/header.inc
index 5ffc844bd..5ffc844bd 100644
--- a/data/maps/Route110_TrickHousePuzzle6/header.s
+++ b/data/maps/Route110_TrickHousePuzzle6/header.inc
diff --git a/data/maps/Route110_TrickHousePuzzle7/header.s b/data/maps/Route110_TrickHousePuzzle7/header.inc
index cea170daa..cea170daa 100644
--- a/data/maps/Route110_TrickHousePuzzle7/header.s
+++ b/data/maps/Route110_TrickHousePuzzle7/header.inc
diff --git a/data/maps/Route110_TrickHousePuzzle8/header.s b/data/maps/Route110_TrickHousePuzzle8/header.inc
index 6a4dc7051..6a4dc7051 100644
--- a/data/maps/Route110_TrickHousePuzzle8/header.s
+++ b/data/maps/Route110_TrickHousePuzzle8/header.inc
diff --git a/data/maps/Route111/connections.s b/data/maps/Route111/connections.inc
index 411dea34b..411dea34b 100644
--- a/data/maps/Route111/connections.s
+++ b/data/maps/Route111/connections.inc
diff --git a/data/maps/Route111/header.s b/data/maps/Route111/header.inc
index 5af1fb1c2..5af1fb1c2 100644
--- a/data/maps/Route111/header.s
+++ b/data/maps/Route111/header.inc
diff --git a/data/maps/Route111_OldLadysRestStop/header.s b/data/maps/Route111_OldLadysRestStop/header.inc
index 23f4959a3..23f4959a3 100644
--- a/data/maps/Route111_OldLadysRestStop/header.s
+++ b/data/maps/Route111_OldLadysRestStop/header.inc
diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.s b/data/maps/Route111_WinstrateFamilysHouse/header.inc
index d7333f070..d7333f070 100644
--- a/data/maps/Route111_WinstrateFamilysHouse/header.s
+++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc
diff --git a/data/maps/Route112/connections.s b/data/maps/Route112/connections.inc
index eee04163c..eee04163c 100644
--- a/data/maps/Route112/connections.s
+++ b/data/maps/Route112/connections.inc
diff --git a/data/maps/Route112/header.s b/data/maps/Route112/header.inc
index f798451d6..f798451d6 100644
--- a/data/maps/Route112/header.s
+++ b/data/maps/Route112/header.inc
diff --git a/data/maps/Route112_CableCarStation/header.s b/data/maps/Route112_CableCarStation/header.inc
index 3d025fb7b..3d025fb7b 100644
--- a/data/maps/Route112_CableCarStation/header.s
+++ b/data/maps/Route112_CableCarStation/header.inc
diff --git a/data/maps/Route113/connections.s b/data/maps/Route113/connections.inc
index ffa7b231d..ffa7b231d 100644
--- a/data/maps/Route113/connections.s
+++ b/data/maps/Route113/connections.inc
diff --git a/data/maps/Route113/header.s b/data/maps/Route113/header.inc
index 5792f97c3..5792f97c3 100644
--- a/data/maps/Route113/header.s
+++ b/data/maps/Route113/header.inc
diff --git a/data/maps/Route113_GlassWorkshop/header.s b/data/maps/Route113_GlassWorkshop/header.inc
index a8bfdd35d..a8bfdd35d 100644
--- a/data/maps/Route113_GlassWorkshop/header.s
+++ b/data/maps/Route113_GlassWorkshop/header.inc
diff --git a/data/maps/Route114/connections.s b/data/maps/Route114/connections.inc
index 603c5e4b1..603c5e4b1 100644
--- a/data/maps/Route114/connections.s
+++ b/data/maps/Route114/connections.inc
diff --git a/data/maps/Route114/header.s b/data/maps/Route114/header.inc
index cfb5f4114..cfb5f4114 100644
--- a/data/maps/Route114/header.s
+++ b/data/maps/Route114/header.inc
diff --git a/data/maps/Route114_FossilManiacsHouse/header.s b/data/maps/Route114_FossilManiacsHouse/header.inc
index 2da95c284..2da95c284 100644
--- a/data/maps/Route114_FossilManiacsHouse/header.s
+++ b/data/maps/Route114_FossilManiacsHouse/header.inc
diff --git a/data/maps/Route114_FossilManiacsTunnel/header.s b/data/maps/Route114_FossilManiacsTunnel/header.inc
index b410c822c..b410c822c 100644
--- a/data/maps/Route114_FossilManiacsTunnel/header.s
+++ b/data/maps/Route114_FossilManiacsTunnel/header.inc
diff --git a/data/maps/Route114_LanettesHouse/header.s b/data/maps/Route114_LanettesHouse/header.inc
index a5b7eea50..a5b7eea50 100644
--- a/data/maps/Route114_LanettesHouse/header.s
+++ b/data/maps/Route114_LanettesHouse/header.inc
diff --git a/data/maps/Route115/connections.s b/data/maps/Route115/connections.inc
index 3886f114f..3886f114f 100644
--- a/data/maps/Route115/connections.s
+++ b/data/maps/Route115/connections.inc
diff --git a/data/maps/Route115/header.s b/data/maps/Route115/header.inc
index b11134e28..b11134e28 100644
--- a/data/maps/Route115/header.s
+++ b/data/maps/Route115/header.inc
diff --git a/data/maps/Route116/connections.s b/data/maps/Route116/connections.inc
index 787314054..787314054 100644
--- a/data/maps/Route116/connections.s
+++ b/data/maps/Route116/connections.inc
diff --git a/data/maps/Route116/header.s b/data/maps/Route116/header.inc
index f4e145bf1..f4e145bf1 100644
--- a/data/maps/Route116/header.s
+++ b/data/maps/Route116/header.inc
diff --git a/data/maps/Route116_TunnelersRestHouse/header.s b/data/maps/Route116_TunnelersRestHouse/header.inc
index a52c6cada..a52c6cada 100644
--- a/data/maps/Route116_TunnelersRestHouse/header.s
+++ b/data/maps/Route116_TunnelersRestHouse/header.inc
diff --git a/data/maps/Route117/connections.s b/data/maps/Route117/connections.inc
index 2de505e01..2de505e01 100644
--- a/data/maps/Route117/connections.s
+++ b/data/maps/Route117/connections.inc
diff --git a/data/maps/Route117/header.s b/data/maps/Route117/header.inc
index 9649f4728..9649f4728 100644
--- a/data/maps/Route117/header.s
+++ b/data/maps/Route117/header.inc
diff --git a/data/maps/Route117_PokemonDayCare/header.s b/data/maps/Route117_PokemonDayCare/header.inc
index 567819b48..567819b48 100644
--- a/data/maps/Route117_PokemonDayCare/header.s
+++ b/data/maps/Route117_PokemonDayCare/header.inc
diff --git a/data/maps/Route118/connections.s b/data/maps/Route118/connections.inc
index 764071baf..764071baf 100644
--- a/data/maps/Route118/connections.s
+++ b/data/maps/Route118/connections.inc
diff --git a/data/maps/Route118/header.s b/data/maps/Route118/header.inc
index 5b1190621..5b1190621 100644
--- a/data/maps/Route118/header.s
+++ b/data/maps/Route118/header.inc
diff --git a/data/maps/Route119/connections.s b/data/maps/Route119/connections.inc
index 26ce12a01..26ce12a01 100644
--- a/data/maps/Route119/connections.s
+++ b/data/maps/Route119/connections.inc
diff --git a/data/maps/Route119/header.s b/data/maps/Route119/header.inc
index ef5887676..ef5887676 100644
--- a/data/maps/Route119/header.s
+++ b/data/maps/Route119/header.inc
diff --git a/data/maps/Route119_House/header.s b/data/maps/Route119_House/header.inc
index d64c4b804..d64c4b804 100644
--- a/data/maps/Route119_House/header.s
+++ b/data/maps/Route119_House/header.inc
diff --git a/data/maps/Route119_WeatherInstitute_1F/header.s b/data/maps/Route119_WeatherInstitute_1F/header.inc
index b392fbc41..b392fbc41 100644
--- a/data/maps/Route119_WeatherInstitute_1F/header.s
+++ b/data/maps/Route119_WeatherInstitute_1F/header.inc
diff --git a/data/maps/Route119_WeatherInstitute_2F/header.s b/data/maps/Route119_WeatherInstitute_2F/header.inc
index 9a5c3d9d8..9a5c3d9d8 100644
--- a/data/maps/Route119_WeatherInstitute_2F/header.s
+++ b/data/maps/Route119_WeatherInstitute_2F/header.inc
diff --git a/data/maps/Route120/connections.s b/data/maps/Route120/connections.inc
index a0f747c68..a0f747c68 100644
--- a/data/maps/Route120/connections.s
+++ b/data/maps/Route120/connections.inc
diff --git a/data/maps/Route120/header.s b/data/maps/Route120/header.inc
index 3f8be7e95..3f8be7e95 100644
--- a/data/maps/Route120/header.s
+++ b/data/maps/Route120/header.inc
diff --git a/data/maps/Route121/connections.s b/data/maps/Route121/connections.inc
index a77f1b828..a77f1b828 100644
--- a/data/maps/Route121/connections.s
+++ b/data/maps/Route121/connections.inc
diff --git a/data/maps/Route121/header.s b/data/maps/Route121/header.inc
index ba2c3d2da..ba2c3d2da 100644
--- a/data/maps/Route121/header.s
+++ b/data/maps/Route121/header.inc
diff --git a/data/maps/Route121_SafariZoneEntrance/header.s b/data/maps/Route121_SafariZoneEntrance/header.inc
index 4a0bbe244..4a0bbe244 100644
--- a/data/maps/Route121_SafariZoneEntrance/header.s
+++ b/data/maps/Route121_SafariZoneEntrance/header.inc
diff --git a/data/maps/Route122/connections.s b/data/maps/Route122/connections.inc
index 214826c04..214826c04 100644
--- a/data/maps/Route122/connections.s
+++ b/data/maps/Route122/connections.inc
diff --git a/data/maps/Route122/header.s b/data/maps/Route122/header.inc
index 9889cc813..9889cc813 100644
--- a/data/maps/Route122/header.s
+++ b/data/maps/Route122/header.inc
diff --git a/data/maps/Route123/connections.s b/data/maps/Route123/connections.inc
index cc54683f4..cc54683f4 100644
--- a/data/maps/Route123/connections.s
+++ b/data/maps/Route123/connections.inc
diff --git a/data/maps/Route123/header.s b/data/maps/Route123/header.inc
index f33ab3e98..f33ab3e98 100644
--- a/data/maps/Route123/header.s
+++ b/data/maps/Route123/header.inc
diff --git a/data/maps/Route123_BerryMastersHouse/header.s b/data/maps/Route123_BerryMastersHouse/header.inc
index 0eb77ca2e..0eb77ca2e 100644
--- a/data/maps/Route123_BerryMastersHouse/header.s
+++ b/data/maps/Route123_BerryMastersHouse/header.inc
diff --git a/data/maps/Route124/connections.s b/data/maps/Route124/connections.inc
index 5384926b0..5384926b0 100644
--- a/data/maps/Route124/connections.s
+++ b/data/maps/Route124/connections.inc
diff --git a/data/maps/Route124/header.s b/data/maps/Route124/header.inc
index 6e4466225..6e4466225 100644
--- a/data/maps/Route124/header.s
+++ b/data/maps/Route124/header.inc
diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.s b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc
index 472ebc45a..472ebc45a 100644
--- a/data/maps/Route124_DivingTreasureHuntersHouse/header.s
+++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc
diff --git a/data/maps/Route125/connections.s b/data/maps/Route125/connections.inc
index 33b7c705c..33b7c705c 100644
--- a/data/maps/Route125/connections.s
+++ b/data/maps/Route125/connections.inc
diff --git a/data/maps/Route125/header.s b/data/maps/Route125/header.inc
index e7a43a64d..e7a43a64d 100644
--- a/data/maps/Route125/header.s
+++ b/data/maps/Route125/header.inc
diff --git a/data/maps/Route126/connections.s b/data/maps/Route126/connections.inc
index 9ff9688af..9ff9688af 100644
--- a/data/maps/Route126/connections.s
+++ b/data/maps/Route126/connections.inc
diff --git a/data/maps/Route126/header.s b/data/maps/Route126/header.inc
index a973af531..a973af531 100644
--- a/data/maps/Route126/header.s
+++ b/data/maps/Route126/header.inc
diff --git a/data/maps/Route127/connections.s b/data/maps/Route127/connections.inc
index 997c98c61..997c98c61 100644
--- a/data/maps/Route127/connections.s
+++ b/data/maps/Route127/connections.inc
diff --git a/data/maps/Route127/header.s b/data/maps/Route127/header.inc
index a9f887a2b..a9f887a2b 100644
--- a/data/maps/Route127/header.s
+++ b/data/maps/Route127/header.inc
diff --git a/data/maps/Route128/connections.s b/data/maps/Route128/connections.inc
index b187c7f64..b187c7f64 100644
--- a/data/maps/Route128/connections.s
+++ b/data/maps/Route128/connections.inc
diff --git a/data/maps/Route128/header.s b/data/maps/Route128/header.inc
index 9ecc76fb7..9ecc76fb7 100644
--- a/data/maps/Route128/header.s
+++ b/data/maps/Route128/header.inc
diff --git a/data/maps/Route129/connections.s b/data/maps/Route129/connections.inc
index 7a1db2bc7..7a1db2bc7 100644
--- a/data/maps/Route129/connections.s
+++ b/data/maps/Route129/connections.inc
diff --git a/data/maps/Route129/header.s b/data/maps/Route129/header.inc
index 580d69fc7..580d69fc7 100644
--- a/data/maps/Route129/header.s
+++ b/data/maps/Route129/header.inc
diff --git a/data/maps/Route130/connections.s b/data/maps/Route130/connections.inc
index 211eba7f1..211eba7f1 100644
--- a/data/maps/Route130/connections.s
+++ b/data/maps/Route130/connections.inc
diff --git a/data/maps/Route130/header.s b/data/maps/Route130/header.inc
index a788bf9b5..a788bf9b5 100644
--- a/data/maps/Route130/header.s
+++ b/data/maps/Route130/header.inc
diff --git a/data/maps/Route131/connections.s b/data/maps/Route131/connections.inc
index a1b1adff7..a1b1adff7 100644
--- a/data/maps/Route131/connections.s
+++ b/data/maps/Route131/connections.inc
diff --git a/data/maps/Route131/header.s b/data/maps/Route131/header.inc
index e7d9ea231..e7d9ea231 100644
--- a/data/maps/Route131/header.s
+++ b/data/maps/Route131/header.inc
diff --git a/data/maps/Route132/connections.s b/data/maps/Route132/connections.inc
index a0aff0a42..a0aff0a42 100644
--- a/data/maps/Route132/connections.s
+++ b/data/maps/Route132/connections.inc
diff --git a/data/maps/Route132/header.s b/data/maps/Route132/header.inc
index d7ad0b2a4..d7ad0b2a4 100644
--- a/data/maps/Route132/header.s
+++ b/data/maps/Route132/header.inc
diff --git a/data/maps/Route133/connections.s b/data/maps/Route133/connections.inc
index 979b49ee9..979b49ee9 100644
--- a/data/maps/Route133/connections.s
+++ b/data/maps/Route133/connections.inc
diff --git a/data/maps/Route133/header.s b/data/maps/Route133/header.inc
index 4c0f718ec..4c0f718ec 100644
--- a/data/maps/Route133/header.s
+++ b/data/maps/Route133/header.inc
diff --git a/data/maps/Route134/connections.s b/data/maps/Route134/connections.inc
index aba5c2c9a..aba5c2c9a 100644
--- a/data/maps/Route134/connections.s
+++ b/data/maps/Route134/connections.inc
diff --git a/data/maps/Route134/header.s b/data/maps/Route134/header.inc
index 2ca22c40e..2ca22c40e 100644
--- a/data/maps/Route134/header.s
+++ b/data/maps/Route134/header.inc
diff --git a/data/maps/RustboroCity/connections.s b/data/maps/RustboroCity/connections.inc
index fd1fa519c..fd1fa519c 100644
--- a/data/maps/RustboroCity/connections.s
+++ b/data/maps/RustboroCity/connections.inc
diff --git a/data/maps/RustboroCity/header.s b/data/maps/RustboroCity/header.inc
index d1352ea3e..d1352ea3e 100644
--- a/data/maps/RustboroCity/header.s
+++ b/data/maps/RustboroCity/header.inc
diff --git a/data/maps/RustboroCity_CuttersHouse/header.s b/data/maps/RustboroCity_CuttersHouse/header.inc
index c3b5a6d7c..c3b5a6d7c 100644
--- a/data/maps/RustboroCity_CuttersHouse/header.s
+++ b/data/maps/RustboroCity_CuttersHouse/header.inc
diff --git a/data/maps/RustboroCity_DevonCorp_1F/header.s b/data/maps/RustboroCity_DevonCorp_1F/header.inc
index 5539006ff..5539006ff 100644
--- a/data/maps/RustboroCity_DevonCorp_1F/header.s
+++ b/data/maps/RustboroCity_DevonCorp_1F/header.inc
diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.s b/data/maps/RustboroCity_DevonCorp_2F/header.inc
index 76bbea60b..76bbea60b 100644
--- a/data/maps/RustboroCity_DevonCorp_2F/header.s
+++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc
diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.s b/data/maps/RustboroCity_DevonCorp_3F/header.inc
index c3d4549de..c3d4549de 100644
--- a/data/maps/RustboroCity_DevonCorp_3F/header.s
+++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc
diff --git a/data/maps/RustboroCity_Flat1_1F/header.s b/data/maps/RustboroCity_Flat1_1F/header.inc
index 68a5697be..68a5697be 100644
--- a/data/maps/RustboroCity_Flat1_1F/header.s
+++ b/data/maps/RustboroCity_Flat1_1F/header.inc
diff --git a/data/maps/RustboroCity_Flat1_2F/header.s b/data/maps/RustboroCity_Flat1_2F/header.inc
index f0b29ae0d..f0b29ae0d 100644
--- a/data/maps/RustboroCity_Flat1_2F/header.s
+++ b/data/maps/RustboroCity_Flat1_2F/header.inc
diff --git a/data/maps/RustboroCity_Flat2_1F/header.s b/data/maps/RustboroCity_Flat2_1F/header.inc
index 5f54f2624..5f54f2624 100644
--- a/data/maps/RustboroCity_Flat2_1F/header.s
+++ b/data/maps/RustboroCity_Flat2_1F/header.inc
diff --git a/data/maps/RustboroCity_Flat2_2F/header.s b/data/maps/RustboroCity_Flat2_2F/header.inc
index 086947abf..086947abf 100644
--- a/data/maps/RustboroCity_Flat2_2F/header.s
+++ b/data/maps/RustboroCity_Flat2_2F/header.inc
diff --git a/data/maps/RustboroCity_Flat2_3F/header.s b/data/maps/RustboroCity_Flat2_3F/header.inc
index 42866ebf2..42866ebf2 100644
--- a/data/maps/RustboroCity_Flat2_3F/header.s
+++ b/data/maps/RustboroCity_Flat2_3F/header.inc
diff --git a/data/maps/RustboroCity_Gym/header.s b/data/maps/RustboroCity_Gym/header.inc
index 5d18e933b..5d18e933b 100644
--- a/data/maps/RustboroCity_Gym/header.s
+++ b/data/maps/RustboroCity_Gym/header.inc
diff --git a/data/maps/RustboroCity_House1/header.s b/data/maps/RustboroCity_House1/header.inc
index 9ee09b4e3..9ee09b4e3 100644
--- a/data/maps/RustboroCity_House1/header.s
+++ b/data/maps/RustboroCity_House1/header.inc
diff --git a/data/maps/RustboroCity_House2/header.s b/data/maps/RustboroCity_House2/header.inc
index 0122c6a92..0122c6a92 100644
--- a/data/maps/RustboroCity_House2/header.s
+++ b/data/maps/RustboroCity_House2/header.inc
diff --git a/data/maps/RustboroCity_House3/header.s b/data/maps/RustboroCity_House3/header.inc
index 8876f8499..8876f8499 100644
--- a/data/maps/RustboroCity_House3/header.s
+++ b/data/maps/RustboroCity_House3/header.inc
diff --git a/data/maps/RustboroCity_Mart/header.s b/data/maps/RustboroCity_Mart/header.inc
index 535c3e2fc..535c3e2fc 100644
--- a/data/maps/RustboroCity_Mart/header.s
+++ b/data/maps/RustboroCity_Mart/header.inc
diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.s b/data/maps/RustboroCity_PokemonCenter_1F/header.inc
index 57cb84729..57cb84729 100644
--- a/data/maps/RustboroCity_PokemonCenter_1F/header.s
+++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc
diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.s b/data/maps/RustboroCity_PokemonCenter_2F/header.inc
index 838a5e5a9..838a5e5a9 100644
--- a/data/maps/RustboroCity_PokemonCenter_2F/header.s
+++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc
diff --git a/data/maps/RustboroCity_PokemonSchool/header.s b/data/maps/RustboroCity_PokemonSchool/header.inc
index dfb46b6f1..dfb46b6f1 100644
--- a/data/maps/RustboroCity_PokemonSchool/header.s
+++ b/data/maps/RustboroCity_PokemonSchool/header.inc
diff --git a/data/maps/RusturfTunnel/header.s b/data/maps/RusturfTunnel/header.inc
index 3e497a1e5..3e497a1e5 100644
--- a/data/maps/RusturfTunnel/header.s
+++ b/data/maps/RusturfTunnel/header.inc
diff --git a/data/maps/SSTidalCorridor/header.s b/data/maps/SSTidalCorridor/header.inc
index 6370e81ca..6370e81ca 100644
--- a/data/maps/SSTidalCorridor/header.s
+++ b/data/maps/SSTidalCorridor/header.inc
diff --git a/data/maps/SSTidalLowerDeck/header.s b/data/maps/SSTidalLowerDeck/header.inc
index 5b6bec321..5b6bec321 100644
--- a/data/maps/SSTidalLowerDeck/header.s
+++ b/data/maps/SSTidalLowerDeck/header.inc
diff --git a/data/maps/SSTidalRooms/header.s b/data/maps/SSTidalRooms/header.inc
index 36bcab75e..36bcab75e 100644
--- a/data/maps/SSTidalRooms/header.s
+++ b/data/maps/SSTidalRooms/header.inc
diff --git a/data/maps/SafariZone_Northeast/connections.s b/data/maps/SafariZone_Northeast/connections.inc
index 5c9c47793..5c9c47793 100644
--- a/data/maps/SafariZone_Northeast/connections.s
+++ b/data/maps/SafariZone_Northeast/connections.inc
diff --git a/data/maps/SafariZone_Northeast/header.s b/data/maps/SafariZone_Northeast/header.inc
index 55bef875f..55bef875f 100644
--- a/data/maps/SafariZone_Northeast/header.s
+++ b/data/maps/SafariZone_Northeast/header.inc
diff --git a/data/maps/SafariZone_Northwest/connections.s b/data/maps/SafariZone_Northwest/connections.inc
index b36d15bad..b36d15bad 100644
--- a/data/maps/SafariZone_Northwest/connections.s
+++ b/data/maps/SafariZone_Northwest/connections.inc
diff --git a/data/maps/SafariZone_Northwest/header.s b/data/maps/SafariZone_Northwest/header.inc
index a3c85c6ed..a3c85c6ed 100644
--- a/data/maps/SafariZone_Northwest/header.s
+++ b/data/maps/SafariZone_Northwest/header.inc
diff --git a/data/maps/SafariZone_RestHouse/header.s b/data/maps/SafariZone_RestHouse/header.inc
index 3db84b0b7..3db84b0b7 100644
--- a/data/maps/SafariZone_RestHouse/header.s
+++ b/data/maps/SafariZone_RestHouse/header.inc
diff --git a/data/maps/SafariZone_Southeast/connections.s b/data/maps/SafariZone_Southeast/connections.inc
index e4782d1aa..e4782d1aa 100644
--- a/data/maps/SafariZone_Southeast/connections.s
+++ b/data/maps/SafariZone_Southeast/connections.inc
diff --git a/data/maps/SafariZone_Southeast/header.s b/data/maps/SafariZone_Southeast/header.inc
index 1307c9700..1307c9700 100644
--- a/data/maps/SafariZone_Southeast/header.s
+++ b/data/maps/SafariZone_Southeast/header.inc
diff --git a/data/maps/SafariZone_Southwest/connections.s b/data/maps/SafariZone_Southwest/connections.inc
index a0fea0609..a0fea0609 100644
--- a/data/maps/SafariZone_Southwest/connections.s
+++ b/data/maps/SafariZone_Southwest/connections.inc
diff --git a/data/maps/SafariZone_Southwest/header.s b/data/maps/SafariZone_Southwest/header.inc
index 548dc24b7..548dc24b7 100644
--- a/data/maps/SafariZone_Southwest/header.s
+++ b/data/maps/SafariZone_Southwest/header.inc
diff --git a/data/maps/ScorchedSlab/header.s b/data/maps/ScorchedSlab/header.inc
index 16e45546e..16e45546e 100644
--- a/data/maps/ScorchedSlab/header.s
+++ b/data/maps/ScorchedSlab/header.inc
diff --git a/data/maps/SeafloorCavern_Entrance/header.s b/data/maps/SeafloorCavern_Entrance/header.inc
index d768c1099..d768c1099 100644
--- a/data/maps/SeafloorCavern_Entrance/header.s
+++ b/data/maps/SeafloorCavern_Entrance/header.inc
diff --git a/data/maps/SeafloorCavern_Room1/header.s b/data/maps/SeafloorCavern_Room1/header.inc
index affbaf21c..affbaf21c 100644
--- a/data/maps/SeafloorCavern_Room1/header.s
+++ b/data/maps/SeafloorCavern_Room1/header.inc
diff --git a/data/maps/SeafloorCavern_Room2/header.s b/data/maps/SeafloorCavern_Room2/header.inc
index 6e0e7455d..6e0e7455d 100644
--- a/data/maps/SeafloorCavern_Room2/header.s
+++ b/data/maps/SeafloorCavern_Room2/header.inc
diff --git a/data/maps/SeafloorCavern_Room3/header.s b/data/maps/SeafloorCavern_Room3/header.inc
index e2a432cd9..e2a432cd9 100644
--- a/data/maps/SeafloorCavern_Room3/header.s
+++ b/data/maps/SeafloorCavern_Room3/header.inc
diff --git a/data/maps/SeafloorCavern_Room4/header.s b/data/maps/SeafloorCavern_Room4/header.inc
index 0416091d4..0416091d4 100644
--- a/data/maps/SeafloorCavern_Room4/header.s
+++ b/data/maps/SeafloorCavern_Room4/header.inc
diff --git a/data/maps/SeafloorCavern_Room5/header.s b/data/maps/SeafloorCavern_Room5/header.inc
index 3272c7021..3272c7021 100644
--- a/data/maps/SeafloorCavern_Room5/header.s
+++ b/data/maps/SeafloorCavern_Room5/header.inc
diff --git a/data/maps/SeafloorCavern_Room6/header.s b/data/maps/SeafloorCavern_Room6/header.inc
index 18fab912d..18fab912d 100644
--- a/data/maps/SeafloorCavern_Room6/header.s
+++ b/data/maps/SeafloorCavern_Room6/header.inc
diff --git a/data/maps/SeafloorCavern_Room7/header.s b/data/maps/SeafloorCavern_Room7/header.inc
index ff7579206..ff7579206 100644
--- a/data/maps/SeafloorCavern_Room7/header.s
+++ b/data/maps/SeafloorCavern_Room7/header.inc
diff --git a/data/maps/SeafloorCavern_Room8/header.s b/data/maps/SeafloorCavern_Room8/header.inc
index f443c8530..f443c8530 100644
--- a/data/maps/SeafloorCavern_Room8/header.s
+++ b/data/maps/SeafloorCavern_Room8/header.inc
diff --git a/data/maps/SeafloorCavern_Room9/header.s b/data/maps/SeafloorCavern_Room9/header.inc
index 10303ec46..10303ec46 100644
--- a/data/maps/SeafloorCavern_Room9/header.s
+++ b/data/maps/SeafloorCavern_Room9/header.inc
diff --git a/data/maps/SealedChamber_InnerRoom/header.s b/data/maps/SealedChamber_InnerRoom/header.inc
index 6ae714a1f..6ae714a1f 100644
--- a/data/maps/SealedChamber_InnerRoom/header.s
+++ b/data/maps/SealedChamber_InnerRoom/header.inc
diff --git a/data/maps/SealedChamber_OuterRoom/header.s b/data/maps/SealedChamber_OuterRoom/header.inc
index fe35a8210..fe35a8210 100644
--- a/data/maps/SealedChamber_OuterRoom/header.s
+++ b/data/maps/SealedChamber_OuterRoom/header.inc
diff --git a/data/maps/SecretBase_BlueCave1/header.s b/data/maps/SecretBase_BlueCave1/header.inc
index 24641e4e6..24641e4e6 100644
--- a/data/maps/SecretBase_BlueCave1/header.s
+++ b/data/maps/SecretBase_BlueCave1/header.inc
diff --git a/data/maps/SecretBase_BlueCave2/header.s b/data/maps/SecretBase_BlueCave2/header.inc
index 599abd34a..599abd34a 100644
--- a/data/maps/SecretBase_BlueCave2/header.s
+++ b/data/maps/SecretBase_BlueCave2/header.inc
diff --git a/data/maps/SecretBase_BlueCave3/header.s b/data/maps/SecretBase_BlueCave3/header.inc
index 2adbdb4e5..2adbdb4e5 100644
--- a/data/maps/SecretBase_BlueCave3/header.s
+++ b/data/maps/SecretBase_BlueCave3/header.inc
diff --git a/data/maps/SecretBase_BlueCave4/header.s b/data/maps/SecretBase_BlueCave4/header.inc
index 269a276ef..269a276ef 100644
--- a/data/maps/SecretBase_BlueCave4/header.s
+++ b/data/maps/SecretBase_BlueCave4/header.inc
diff --git a/data/maps/SecretBase_BrownCave1/header.s b/data/maps/SecretBase_BrownCave1/header.inc
index b54737d93..b54737d93 100644
--- a/data/maps/SecretBase_BrownCave1/header.s
+++ b/data/maps/SecretBase_BrownCave1/header.inc
diff --git a/data/maps/SecretBase_BrownCave2/header.s b/data/maps/SecretBase_BrownCave2/header.inc
index e84bfd2eb..e84bfd2eb 100644
--- a/data/maps/SecretBase_BrownCave2/header.s
+++ b/data/maps/SecretBase_BrownCave2/header.inc
diff --git a/data/maps/SecretBase_BrownCave3/header.s b/data/maps/SecretBase_BrownCave3/header.inc
index 9e0dc78e0..9e0dc78e0 100644
--- a/data/maps/SecretBase_BrownCave3/header.s
+++ b/data/maps/SecretBase_BrownCave3/header.inc
diff --git a/data/maps/SecretBase_BrownCave4/header.s b/data/maps/SecretBase_BrownCave4/header.inc
index d21c844da..d21c844da 100644
--- a/data/maps/SecretBase_BrownCave4/header.s
+++ b/data/maps/SecretBase_BrownCave4/header.inc
diff --git a/data/maps/SecretBase_RedCave1/header.s b/data/maps/SecretBase_RedCave1/header.inc
index 60df36c7e..60df36c7e 100644
--- a/data/maps/SecretBase_RedCave1/header.s
+++ b/data/maps/SecretBase_RedCave1/header.inc
diff --git a/data/maps/SecretBase_RedCave2/header.s b/data/maps/SecretBase_RedCave2/header.inc
index 5325c424e..5325c424e 100644
--- a/data/maps/SecretBase_RedCave2/header.s
+++ b/data/maps/SecretBase_RedCave2/header.inc
diff --git a/data/maps/SecretBase_RedCave3/header.s b/data/maps/SecretBase_RedCave3/header.inc
index a86997805..a86997805 100644
--- a/data/maps/SecretBase_RedCave3/header.s
+++ b/data/maps/SecretBase_RedCave3/header.inc
diff --git a/data/maps/SecretBase_RedCave4/header.s b/data/maps/SecretBase_RedCave4/header.inc
index 40e830726..40e830726 100644
--- a/data/maps/SecretBase_RedCave4/header.s
+++ b/data/maps/SecretBase_RedCave4/header.inc
diff --git a/data/maps/SecretBase_Shrub1/header.s b/data/maps/SecretBase_Shrub1/header.inc
index 3b634c729..3b634c729 100644
--- a/data/maps/SecretBase_Shrub1/header.s
+++ b/data/maps/SecretBase_Shrub1/header.inc
diff --git a/data/maps/SecretBase_Shrub2/header.s b/data/maps/SecretBase_Shrub2/header.inc
index 1c27f8945..1c27f8945 100644
--- a/data/maps/SecretBase_Shrub2/header.s
+++ b/data/maps/SecretBase_Shrub2/header.inc
diff --git a/data/maps/SecretBase_Shrub3/header.s b/data/maps/SecretBase_Shrub3/header.inc
index e6e85c9ed..e6e85c9ed 100644
--- a/data/maps/SecretBase_Shrub3/header.s
+++ b/data/maps/SecretBase_Shrub3/header.inc
diff --git a/data/maps/SecretBase_Shrub4/header.s b/data/maps/SecretBase_Shrub4/header.inc
index 1e610463f..1e610463f 100644
--- a/data/maps/SecretBase_Shrub4/header.s
+++ b/data/maps/SecretBase_Shrub4/header.inc
diff --git a/data/maps/SecretBase_Tree1/header.s b/data/maps/SecretBase_Tree1/header.inc
index 64722268c..64722268c 100644
--- a/data/maps/SecretBase_Tree1/header.s
+++ b/data/maps/SecretBase_Tree1/header.inc
diff --git a/data/maps/SecretBase_Tree2/header.s b/data/maps/SecretBase_Tree2/header.inc
index fefd54e68..fefd54e68 100644
--- a/data/maps/SecretBase_Tree2/header.s
+++ b/data/maps/SecretBase_Tree2/header.inc
diff --git a/data/maps/SecretBase_Tree3/header.s b/data/maps/SecretBase_Tree3/header.inc
index 09e55e66d..09e55e66d 100644
--- a/data/maps/SecretBase_Tree3/header.s
+++ b/data/maps/SecretBase_Tree3/header.inc
diff --git a/data/maps/SecretBase_Tree4/header.s b/data/maps/SecretBase_Tree4/header.inc
index cfb58242e..cfb58242e 100644
--- a/data/maps/SecretBase_Tree4/header.s
+++ b/data/maps/SecretBase_Tree4/header.inc
diff --git a/data/maps/SecretBase_YellowCave1/header.s b/data/maps/SecretBase_YellowCave1/header.inc
index 42a63256f..42a63256f 100644
--- a/data/maps/SecretBase_YellowCave1/header.s
+++ b/data/maps/SecretBase_YellowCave1/header.inc
diff --git a/data/maps/SecretBase_YellowCave2/header.s b/data/maps/SecretBase_YellowCave2/header.inc
index d57acde5c..d57acde5c 100644
--- a/data/maps/SecretBase_YellowCave2/header.s
+++ b/data/maps/SecretBase_YellowCave2/header.inc
diff --git a/data/maps/SecretBase_YellowCave3/header.s b/data/maps/SecretBase_YellowCave3/header.inc
index ecb6b7086..ecb6b7086 100644
--- a/data/maps/SecretBase_YellowCave3/header.s
+++ b/data/maps/SecretBase_YellowCave3/header.inc
diff --git a/data/maps/SecretBase_YellowCave4/header.s b/data/maps/SecretBase_YellowCave4/header.inc
index 97de9362b..97de9362b 100644
--- a/data/maps/SecretBase_YellowCave4/header.s
+++ b/data/maps/SecretBase_YellowCave4/header.inc
diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.s b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc
index e012b1a69..e012b1a69 100644
--- a/data/maps/ShoalCave_HighTideEntranceRoom/header.s
+++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc
diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.s b/data/maps/ShoalCave_HighTideInnerRoom/header.inc
index c3f16869b..c3f16869b 100644
--- a/data/maps/ShoalCave_HighTideInnerRoom/header.s
+++ b/data/maps/ShoalCave_HighTideInnerRoom/header.inc
diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/header.s b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc
index db63a0f9d..db63a0f9d 100644
--- a/data/maps/ShoalCave_LowTideEntranceRoom/header.s
+++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc
diff --git a/data/maps/ShoalCave_LowTideIceRoom/header.s b/data/maps/ShoalCave_LowTideIceRoom/header.inc
index ba36a090d..ba36a090d 100644
--- a/data/maps/ShoalCave_LowTideIceRoom/header.s
+++ b/data/maps/ShoalCave_LowTideIceRoom/header.inc
diff --git a/data/maps/ShoalCave_LowTideInnerRoom/header.s b/data/maps/ShoalCave_LowTideInnerRoom/header.inc
index c038dafcd..c038dafcd 100644
--- a/data/maps/ShoalCave_LowTideInnerRoom/header.s
+++ b/data/maps/ShoalCave_LowTideInnerRoom/header.inc
diff --git a/data/maps/ShoalCave_LowTideLowerRoom/header.s b/data/maps/ShoalCave_LowTideLowerRoom/header.inc
index 6fe4efb01..6fe4efb01 100644
--- a/data/maps/ShoalCave_LowTideLowerRoom/header.s
+++ b/data/maps/ShoalCave_LowTideLowerRoom/header.inc
diff --git a/data/maps/ShoalCave_LowTideStairsRoom/header.s b/data/maps/ShoalCave_LowTideStairsRoom/header.inc
index d3d904731..d3d904731 100644
--- a/data/maps/ShoalCave_LowTideStairsRoom/header.s
+++ b/data/maps/ShoalCave_LowTideStairsRoom/header.inc
diff --git a/data/maps/SingleBattleColosseum/header.s b/data/maps/SingleBattleColosseum/header.inc
index f62205a55..f62205a55 100644
--- a/data/maps/SingleBattleColosseum/header.s
+++ b/data/maps/SingleBattleColosseum/header.inc
diff --git a/data/maps/SkyPillar_1F/header.s b/data/maps/SkyPillar_1F/header.inc
index 4ccc410da..4ccc410da 100644
--- a/data/maps/SkyPillar_1F/header.s
+++ b/data/maps/SkyPillar_1F/header.inc
diff --git a/data/maps/SkyPillar_2F/header.s b/data/maps/SkyPillar_2F/header.inc
index 1e3b0393d..1e3b0393d 100644
--- a/data/maps/SkyPillar_2F/header.s
+++ b/data/maps/SkyPillar_2F/header.inc
diff --git a/data/maps/SkyPillar_3F/header.s b/data/maps/SkyPillar_3F/header.inc
index bd6d9cb86..bd6d9cb86 100644
--- a/data/maps/SkyPillar_3F/header.s
+++ b/data/maps/SkyPillar_3F/header.inc
diff --git a/data/maps/SkyPillar_4F/header.s b/data/maps/SkyPillar_4F/header.inc
index 50869e629..50869e629 100644
--- a/data/maps/SkyPillar_4F/header.s
+++ b/data/maps/SkyPillar_4F/header.inc
diff --git a/data/maps/SkyPillar_5F/header.s b/data/maps/SkyPillar_5F/header.inc
index 16da8bcf4..16da8bcf4 100644
--- a/data/maps/SkyPillar_5F/header.s
+++ b/data/maps/SkyPillar_5F/header.inc
diff --git a/data/maps/SkyPillar_Entrance/header.s b/data/maps/SkyPillar_Entrance/header.inc
index 89d9becd9..89d9becd9 100644
--- a/data/maps/SkyPillar_Entrance/header.s
+++ b/data/maps/SkyPillar_Entrance/header.inc
diff --git a/data/maps/SkyPillar_Outside/header.s b/data/maps/SkyPillar_Outside/header.inc
index 44e9a5991..44e9a5991 100644
--- a/data/maps/SkyPillar_Outside/header.s
+++ b/data/maps/SkyPillar_Outside/header.inc
diff --git a/data/maps/SkyPillar_Top/header.s b/data/maps/SkyPillar_Top/header.inc
index 0c241fe27..0c241fe27 100644
--- a/data/maps/SkyPillar_Top/header.s
+++ b/data/maps/SkyPillar_Top/header.inc
diff --git a/data/maps/SlateportCity/connections.s b/data/maps/SlateportCity/connections.inc
index 2d3980a8c..2d3980a8c 100644
--- a/data/maps/SlateportCity/connections.s
+++ b/data/maps/SlateportCity/connections.inc
diff --git a/data/maps/SlateportCity/header.s b/data/maps/SlateportCity/header.inc
index 6575e0de5..6575e0de5 100644
--- a/data/maps/SlateportCity/header.s
+++ b/data/maps/SlateportCity/header.inc
diff --git a/data/maps/SlateportCity_ContestHall/header.s b/data/maps/SlateportCity_ContestHall/header.inc
index 64cc06565..64cc06565 100644
--- a/data/maps/SlateportCity_ContestHall/header.s
+++ b/data/maps/SlateportCity_ContestHall/header.inc
diff --git a/data/maps/SlateportCity_ContestLobby/header.s b/data/maps/SlateportCity_ContestLobby/header.inc
index 440139e64..440139e64 100644
--- a/data/maps/SlateportCity_ContestLobby/header.s
+++ b/data/maps/SlateportCity_ContestLobby/header.inc
diff --git a/data/maps/SlateportCity_Harbor/header.s b/data/maps/SlateportCity_Harbor/header.inc
index d7da07b49..d7da07b49 100644
--- a/data/maps/SlateportCity_Harbor/header.s
+++ b/data/maps/SlateportCity_Harbor/header.inc
diff --git a/data/maps/SlateportCity_House1/header.s b/data/maps/SlateportCity_House1/header.inc
index 75a5cdb72..75a5cdb72 100644
--- a/data/maps/SlateportCity_House1/header.s
+++ b/data/maps/SlateportCity_House1/header.inc
diff --git a/data/maps/SlateportCity_House2/header.s b/data/maps/SlateportCity_House2/header.inc
index 00b9399a3..00b9399a3 100644
--- a/data/maps/SlateportCity_House2/header.s
+++ b/data/maps/SlateportCity_House2/header.inc
diff --git a/data/maps/SlateportCity_Mart/header.s b/data/maps/SlateportCity_Mart/header.inc
index 12f2172be..12f2172be 100644
--- a/data/maps/SlateportCity_Mart/header.s
+++ b/data/maps/SlateportCity_Mart/header.inc
diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/header.s b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc
index 7aaa2ff91..7aaa2ff91 100644
--- a/data/maps/SlateportCity_OceanicMuseum_1F/header.s
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/header.s b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc
index 3d9153f56..3d9153f56 100644
--- a/data/maps/SlateportCity_OceanicMuseum_2F/header.s
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc
diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.s b/data/maps/SlateportCity_PokemonCenter_1F/header.inc
index d668f0efc..d668f0efc 100644
--- a/data/maps/SlateportCity_PokemonCenter_1F/header.s
+++ b/data/maps/SlateportCity_PokemonCenter_1F/header.inc
diff --git a/data/maps/SlateportCity_PokemonCenter_2F/header.s b/data/maps/SlateportCity_PokemonCenter_2F/header.inc
index 36c726d7f..36c726d7f 100644
--- a/data/maps/SlateportCity_PokemonCenter_2F/header.s
+++ b/data/maps/SlateportCity_PokemonCenter_2F/header.inc
diff --git a/data/maps/SlateportCity_PokemonFanClub/header.s b/data/maps/SlateportCity_PokemonFanClub/header.inc
index 1672d21b1..1672d21b1 100644
--- a/data/maps/SlateportCity_PokemonFanClub/header.s
+++ b/data/maps/SlateportCity_PokemonFanClub/header.inc
diff --git a/data/maps/SlateportCity_SternsShipyard_1F/header.s b/data/maps/SlateportCity_SternsShipyard_1F/header.inc
index c3516151e..c3516151e 100644
--- a/data/maps/SlateportCity_SternsShipyard_1F/header.s
+++ b/data/maps/SlateportCity_SternsShipyard_1F/header.inc
diff --git a/data/maps/SlateportCity_SternsShipyard_2F/header.s b/data/maps/SlateportCity_SternsShipyard_2F/header.inc
index 242e061aa..242e061aa 100644
--- a/data/maps/SlateportCity_SternsShipyard_2F/header.s
+++ b/data/maps/SlateportCity_SternsShipyard_2F/header.inc
diff --git a/data/maps/SootopolisCity/connections.s b/data/maps/SootopolisCity/connections.inc
index dcf558dcd..dcf558dcd 100644
--- a/data/maps/SootopolisCity/connections.s
+++ b/data/maps/SootopolisCity/connections.inc
diff --git a/data/maps/SootopolisCity/header.s b/data/maps/SootopolisCity/header.inc
index d5cbae0be..d5cbae0be 100644
--- a/data/maps/SootopolisCity/header.s
+++ b/data/maps/SootopolisCity/header.inc
diff --git a/data/maps/SootopolisCity_Gym_1F/header.s b/data/maps/SootopolisCity_Gym_1F/header.inc
index 185bdc970..185bdc970 100644
--- a/data/maps/SootopolisCity_Gym_1F/header.s
+++ b/data/maps/SootopolisCity_Gym_1F/header.inc
diff --git a/data/maps/SootopolisCity_Gym_B1F/header.s b/data/maps/SootopolisCity_Gym_B1F/header.inc
index 104ee8215..104ee8215 100644
--- a/data/maps/SootopolisCity_Gym_B1F/header.s
+++ b/data/maps/SootopolisCity_Gym_B1F/header.inc
diff --git a/data/maps/SootopolisCity_House1/header.s b/data/maps/SootopolisCity_House1/header.inc
index 5ff1eb351..5ff1eb351 100644
--- a/data/maps/SootopolisCity_House1/header.s
+++ b/data/maps/SootopolisCity_House1/header.inc
diff --git a/data/maps/SootopolisCity_House2/header.s b/data/maps/SootopolisCity_House2/header.inc
index 1ff5a7df1..1ff5a7df1 100644
--- a/data/maps/SootopolisCity_House2/header.s
+++ b/data/maps/SootopolisCity_House2/header.inc
diff --git a/data/maps/SootopolisCity_House3/header.s b/data/maps/SootopolisCity_House3/header.inc
index 3c6075fe7..3c6075fe7 100644
--- a/data/maps/SootopolisCity_House3/header.s
+++ b/data/maps/SootopolisCity_House3/header.inc
diff --git a/data/maps/SootopolisCity_House4/header.s b/data/maps/SootopolisCity_House4/header.inc
index f155d1980..f155d1980 100644
--- a/data/maps/SootopolisCity_House4/header.s
+++ b/data/maps/SootopolisCity_House4/header.inc
diff --git a/data/maps/SootopolisCity_House5/header.s b/data/maps/SootopolisCity_House5/header.inc
index 7cfe101ac..7cfe101ac 100644
--- a/data/maps/SootopolisCity_House5/header.s
+++ b/data/maps/SootopolisCity_House5/header.inc
diff --git a/data/maps/SootopolisCity_House6/header.s b/data/maps/SootopolisCity_House6/header.inc
index 536872e88..536872e88 100644
--- a/data/maps/SootopolisCity_House6/header.s
+++ b/data/maps/SootopolisCity_House6/header.inc
diff --git a/data/maps/SootopolisCity_House7/header.s b/data/maps/SootopolisCity_House7/header.inc
index 598a84316..598a84316 100644
--- a/data/maps/SootopolisCity_House7/header.s
+++ b/data/maps/SootopolisCity_House7/header.inc
diff --git a/data/maps/SootopolisCity_House8/header.s b/data/maps/SootopolisCity_House8/header.inc
index 4d6619797..4d6619797 100644
--- a/data/maps/SootopolisCity_House8/header.s
+++ b/data/maps/SootopolisCity_House8/header.inc
diff --git a/data/maps/SootopolisCity_Mart/header.s b/data/maps/SootopolisCity_Mart/header.inc
index 47505e04d..47505e04d 100644
--- a/data/maps/SootopolisCity_Mart/header.s
+++ b/data/maps/SootopolisCity_Mart/header.inc
diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.s b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc
index d0cef1039..d0cef1039 100644
--- a/data/maps/SootopolisCity_PokemonCenter_1F/header.s
+++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc
diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/header.s b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc
index 4bdb48a7d..4bdb48a7d 100644
--- a/data/maps/SootopolisCity_PokemonCenter_2F/header.s
+++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc
diff --git a/data/maps/SouthernIsland_Exterior/header.s b/data/maps/SouthernIsland_Exterior/header.inc
index 0579c81bc..0579c81bc 100644
--- a/data/maps/SouthernIsland_Exterior/header.s
+++ b/data/maps/SouthernIsland_Exterior/header.inc
diff --git a/data/maps/SouthernIsland_Interior/header.s b/data/maps/SouthernIsland_Interior/header.inc
index 42cf6db66..42cf6db66 100644
--- a/data/maps/SouthernIsland_Interior/header.s
+++ b/data/maps/SouthernIsland_Interior/header.inc
diff --git a/data/maps/TradeCenter/header.s b/data/maps/TradeCenter/header.inc
index 62bac5400..62bac5400 100644
--- a/data/maps/TradeCenter/header.s
+++ b/data/maps/TradeCenter/header.inc
diff --git a/data/maps/Underwater1/connections.s b/data/maps/Underwater1/connections.inc
index 65c1db901..65c1db901 100644
--- a/data/maps/Underwater1/connections.s
+++ b/data/maps/Underwater1/connections.inc
diff --git a/data/maps/Underwater1/header.s b/data/maps/Underwater1/header.inc
index cfd06e4ce..cfd06e4ce 100644
--- a/data/maps/Underwater1/header.s
+++ b/data/maps/Underwater1/header.inc
diff --git a/data/maps/Underwater2/connections.s b/data/maps/Underwater2/connections.inc
index 58a4db314..58a4db314 100644
--- a/data/maps/Underwater2/connections.s
+++ b/data/maps/Underwater2/connections.inc
diff --git a/data/maps/Underwater2/header.s b/data/maps/Underwater2/header.inc
index 38446fecc..38446fecc 100644
--- a/data/maps/Underwater2/header.s
+++ b/data/maps/Underwater2/header.inc
diff --git a/data/maps/Underwater3/connections.s b/data/maps/Underwater3/connections.inc
index 7d6401826..7d6401826 100644
--- a/data/maps/Underwater3/connections.s
+++ b/data/maps/Underwater3/connections.inc
diff --git a/data/maps/Underwater3/header.s b/data/maps/Underwater3/header.inc
index 3cc773730..3cc773730 100644
--- a/data/maps/Underwater3/header.s
+++ b/data/maps/Underwater3/header.inc
diff --git a/data/maps/Underwater4/connections.s b/data/maps/Underwater4/connections.inc
index 0b9a523ea..0b9a523ea 100644
--- a/data/maps/Underwater4/connections.s
+++ b/data/maps/Underwater4/connections.inc
diff --git a/data/maps/Underwater4/header.s b/data/maps/Underwater4/header.inc
index 8fb1e6faa..8fb1e6faa 100644
--- a/data/maps/Underwater4/header.s
+++ b/data/maps/Underwater4/header.inc
diff --git a/data/maps/Underwater_Route134/header.s b/data/maps/Underwater_Route134/header.inc
index fbc90290c..fbc90290c 100644
--- a/data/maps/Underwater_Route134/header.s
+++ b/data/maps/Underwater_Route134/header.inc
diff --git a/data/maps/Underwater_SeafloorCavern/header.s b/data/maps/Underwater_SeafloorCavern/header.inc
index 09f36c16f..09f36c16f 100644
--- a/data/maps/Underwater_SeafloorCavern/header.s
+++ b/data/maps/Underwater_SeafloorCavern/header.inc
diff --git a/data/maps/Underwater_SealedChamber/header.s b/data/maps/Underwater_SealedChamber/header.inc
index 86ff3384d..86ff3384d 100644
--- a/data/maps/Underwater_SealedChamber/header.s
+++ b/data/maps/Underwater_SealedChamber/header.inc
diff --git a/data/maps/Underwater_SootopolisCity/header.s b/data/maps/Underwater_SootopolisCity/header.inc
index 8aa8bb316..8aa8bb316 100644
--- a/data/maps/Underwater_SootopolisCity/header.s
+++ b/data/maps/Underwater_SootopolisCity/header.inc
diff --git a/data/maps/UnknownMap_25_29/header.s b/data/maps/UnknownMap_25_29/header.inc
index 93d3ab03f..93d3ab03f 100644
--- a/data/maps/UnknownMap_25_29/header.s
+++ b/data/maps/UnknownMap_25_29/header.inc
diff --git a/data/maps/UnknownMap_25_30/header.s b/data/maps/UnknownMap_25_30/header.inc
index 96f2e3de2..96f2e3de2 100644
--- a/data/maps/UnknownMap_25_30/header.s
+++ b/data/maps/UnknownMap_25_30/header.inc
diff --git a/data/maps/UnknownMap_25_31/header.s b/data/maps/UnknownMap_25_31/header.inc
index 135e1c4b1..135e1c4b1 100644
--- a/data/maps/UnknownMap_25_31/header.s
+++ b/data/maps/UnknownMap_25_31/header.inc
diff --git a/data/maps/UnknownMap_25_32/header.s b/data/maps/UnknownMap_25_32/header.inc
index 4aaae9710..4aaae9710 100644
--- a/data/maps/UnknownMap_25_32/header.s
+++ b/data/maps/UnknownMap_25_32/header.inc
diff --git a/data/maps/UnknownMap_25_33/header.s b/data/maps/UnknownMap_25_33/header.inc
index e0bebe753..e0bebe753 100644
--- a/data/maps/UnknownMap_25_33/header.s
+++ b/data/maps/UnknownMap_25_33/header.inc
diff --git a/data/maps/UnknownMap_25_34/header.s b/data/maps/UnknownMap_25_34/header.inc
index b2c174c06..b2c174c06 100644
--- a/data/maps/UnknownMap_25_34/header.s
+++ b/data/maps/UnknownMap_25_34/header.inc
diff --git a/data/maps/VerdanturfTown/connections.s b/data/maps/VerdanturfTown/connections.inc
index e1c9c2418..e1c9c2418 100644
--- a/data/maps/VerdanturfTown/connections.s
+++ b/data/maps/VerdanturfTown/connections.inc
diff --git a/data/maps/VerdanturfTown/header.s b/data/maps/VerdanturfTown/header.inc
index ee41c767f..ee41c767f 100644
--- a/data/maps/VerdanturfTown/header.s
+++ b/data/maps/VerdanturfTown/header.inc
diff --git a/data/maps/VerdanturfTown_ContestHall/header.s b/data/maps/VerdanturfTown_ContestHall/header.inc
index 1c0179afb..1c0179afb 100644
--- a/data/maps/VerdanturfTown_ContestHall/header.s
+++ b/data/maps/VerdanturfTown_ContestHall/header.inc
diff --git a/data/maps/VerdanturfTown_ContestLobby/header.s b/data/maps/VerdanturfTown_ContestLobby/header.inc
index 31274e19f..31274e19f 100644
--- a/data/maps/VerdanturfTown_ContestLobby/header.s
+++ b/data/maps/VerdanturfTown_ContestLobby/header.inc
diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.s b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc
index f1aae5a19..f1aae5a19 100644
--- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.s
+++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc
diff --git a/data/maps/VerdanturfTown_House/header.s b/data/maps/VerdanturfTown_House/header.inc
index e81adee1b..e81adee1b 100644
--- a/data/maps/VerdanturfTown_House/header.s
+++ b/data/maps/VerdanturfTown_House/header.inc
diff --git a/data/maps/VerdanturfTown_Mart/header.s b/data/maps/VerdanturfTown_Mart/header.inc
index db037960c..db037960c 100644
--- a/data/maps/VerdanturfTown_Mart/header.s
+++ b/data/maps/VerdanturfTown_Mart/header.inc
diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/header.s b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc
index 384c8719e..384c8719e 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.s
+++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc
diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/header.s b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc
index 518c11352..518c11352 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.s
+++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc
diff --git a/data/maps/VerdanturfTown_WandasHouse/header.s b/data/maps/VerdanturfTown_WandasHouse/header.inc
index bc31f5457..bc31f5457 100644
--- a/data/maps/VerdanturfTown_WandasHouse/header.s
+++ b/data/maps/VerdanturfTown_WandasHouse/header.inc
diff --git a/data/maps/VictoryRoad_1F/header.s b/data/maps/VictoryRoad_1F/header.inc
index 21937891e..21937891e 100644
--- a/data/maps/VictoryRoad_1F/header.s
+++ b/data/maps/VictoryRoad_1F/header.inc
diff --git a/data/maps/VictoryRoad_B1F/header.s b/data/maps/VictoryRoad_B1F/header.inc
index ebaa67358..ebaa67358 100644
--- a/data/maps/VictoryRoad_B1F/header.s
+++ b/data/maps/VictoryRoad_B1F/header.inc
diff --git a/data/maps/VictoryRoad_B2F/header.s b/data/maps/VictoryRoad_B2F/header.inc
index 4690acbb7..4690acbb7 100644
--- a/data/maps/VictoryRoad_B2F/header.s
+++ b/data/maps/VictoryRoad_B2F/header.inc
diff --git a/data/maps/connections.inc b/data/maps/connections.inc
index 9e5f3a5a5..ab2ffb7b9 100644
--- a/data/maps/connections.inc
+++ b/data/maps/connections.inc
@@ -1,58 +1,58 @@
-	.include "data/maps/LittlerootTown/connections.s"
-	.include "data/maps/OldaleTown/connections.s"
-	.include "data/maps/DewfordTown/connections.s"
-	.include "data/maps/LavaridgeTown/connections.s"
-	.include "data/maps/FallarborTown/connections.s"
-	.include "data/maps/VerdanturfTown/connections.s"
-	.include "data/maps/PacifidlogTown/connections.s"
-	.include "data/maps/PetalburgCity/connections.s"
-	.include "data/maps/SlateportCity/connections.s"
-	.include "data/maps/MauvilleCity/connections.s"
-	.include "data/maps/RustboroCity/connections.s"
-	.include "data/maps/FortreeCity/connections.s"
-	.include "data/maps/LilycoveCity/connections.s"
-	.include "data/maps/MossdeepCity/connections.s"
-	.include "data/maps/SootopolisCity/connections.s"
-	.include "data/maps/EverGrandeCity/connections.s"
-	.include "data/maps/Route101/connections.s"
-	.include "data/maps/Route102/connections.s"
-	.include "data/maps/Route103/connections.s"
-	.include "data/maps/Route104/connections.s"
-	.include "data/maps/Route105/connections.s"
-	.include "data/maps/Route106/connections.s"
-	.include "data/maps/Route107/connections.s"
-	.include "data/maps/Route108/connections.s"
-	.include "data/maps/Route109/connections.s"
-	.include "data/maps/Route110/connections.s"
-	.include "data/maps/Route111/connections.s"
-	.include "data/maps/Route112/connections.s"
-	.include "data/maps/Route113/connections.s"
-	.include "data/maps/Route114/connections.s"
-	.include "data/maps/Route115/connections.s"
-	.include "data/maps/Route116/connections.s"
-	.include "data/maps/Route117/connections.s"
-	.include "data/maps/Route118/connections.s"
-	.include "data/maps/Route119/connections.s"
-	.include "data/maps/Route120/connections.s"
-	.include "data/maps/Route121/connections.s"
-	.include "data/maps/Route122/connections.s"
-	.include "data/maps/Route123/connections.s"
-	.include "data/maps/Route124/connections.s"
-	.include "data/maps/Route125/connections.s"
-	.include "data/maps/Route126/connections.s"
-	.include "data/maps/Route127/connections.s"
-	.include "data/maps/Route128/connections.s"
-	.include "data/maps/Route129/connections.s"
-	.include "data/maps/Route130/connections.s"
-	.include "data/maps/Route131/connections.s"
-	.include "data/maps/Route132/connections.s"
-	.include "data/maps/Route133/connections.s"
-	.include "data/maps/Route134/connections.s"
-	.include "data/maps/Underwater1/connections.s"
-	.include "data/maps/Underwater2/connections.s"
-	.include "data/maps/Underwater3/connections.s"
-	.include "data/maps/Underwater4/connections.s"
-	.include "data/maps/SafariZone_Northwest/connections.s"
-	.include "data/maps/SafariZone_Northeast/connections.s"
-	.include "data/maps/SafariZone_Southwest/connections.s"
-	.include "data/maps/SafariZone_Southeast/connections.s"
+	.include "data/maps/LittlerootTown/connections.inc"
+	.include "data/maps/OldaleTown/connections.inc"
+	.include "data/maps/DewfordTown/connections.inc"
+	.include "data/maps/LavaridgeTown/connections.inc"
+	.include "data/maps/FallarborTown/connections.inc"
+	.include "data/maps/VerdanturfTown/connections.inc"
+	.include "data/maps/PacifidlogTown/connections.inc"
+	.include "data/maps/PetalburgCity/connections.inc"
+	.include "data/maps/SlateportCity/connections.inc"
+	.include "data/maps/MauvilleCity/connections.inc"
+	.include "data/maps/RustboroCity/connections.inc"
+	.include "data/maps/FortreeCity/connections.inc"
+	.include "data/maps/LilycoveCity/connections.inc"
+	.include "data/maps/MossdeepCity/connections.inc"
+	.include "data/maps/SootopolisCity/connections.inc"
+	.include "data/maps/EverGrandeCity/connections.inc"
+	.include "data/maps/Route101/connections.inc"
+	.include "data/maps/Route102/connections.inc"
+	.include "data/maps/Route103/connections.inc"
+	.include "data/maps/Route104/connections.inc"
+	.include "data/maps/Route105/connections.inc"
+	.include "data/maps/Route106/connections.inc"
+	.include "data/maps/Route107/connections.inc"
+	.include "data/maps/Route108/connections.inc"
+	.include "data/maps/Route109/connections.inc"
+	.include "data/maps/Route110/connections.inc"
+	.include "data/maps/Route111/connections.inc"
+	.include "data/maps/Route112/connections.inc"
+	.include "data/maps/Route113/connections.inc"
+	.include "data/maps/Route114/connections.inc"
+	.include "data/maps/Route115/connections.inc"
+	.include "data/maps/Route116/connections.inc"
+	.include "data/maps/Route117/connections.inc"
+	.include "data/maps/Route118/connections.inc"
+	.include "data/maps/Route119/connections.inc"
+	.include "data/maps/Route120/connections.inc"
+	.include "data/maps/Route121/connections.inc"
+	.include "data/maps/Route122/connections.inc"
+	.include "data/maps/Route123/connections.inc"
+	.include "data/maps/Route124/connections.inc"
+	.include "data/maps/Route125/connections.inc"
+	.include "data/maps/Route126/connections.inc"
+	.include "data/maps/Route127/connections.inc"
+	.include "data/maps/Route128/connections.inc"
+	.include "data/maps/Route129/connections.inc"
+	.include "data/maps/Route130/connections.inc"
+	.include "data/maps/Route131/connections.inc"
+	.include "data/maps/Route132/connections.inc"
+	.include "data/maps/Route133/connections.inc"
+	.include "data/maps/Route134/connections.inc"
+	.include "data/maps/Underwater1/connections.inc"
+	.include "data/maps/Underwater2/connections.inc"
+	.include "data/maps/Underwater3/connections.inc"
+	.include "data/maps/Underwater4/connections.inc"
+	.include "data/maps/SafariZone_Northwest/connections.inc"
+	.include "data/maps/SafariZone_Northeast/connections.inc"
+	.include "data/maps/SafariZone_Southwest/connections.inc"
+	.include "data/maps/SafariZone_Southeast/connections.inc"
diff --git a/data/maps/headers.inc b/data/maps/headers.inc
index 71b2936d7..1dce8aba3 100644
--- a/data/maps/headers.inc
+++ b/data/maps/headers.inc
@@ -1,394 +1,394 @@
-	.include "data/maps/PetalburgCity/header.s"
-	.include "data/maps/SlateportCity/header.s"
-	.include "data/maps/MauvilleCity/header.s"
-	.include "data/maps/RustboroCity/header.s"
-	.include "data/maps/FortreeCity/header.s"
-	.include "data/maps/LilycoveCity/header.s"
-	.include "data/maps/MossdeepCity/header.s"
-	.include "data/maps/SootopolisCity/header.s"
-	.include "data/maps/EverGrandeCity/header.s"
-	.include "data/maps/LittlerootTown/header.s"
-	.include "data/maps/OldaleTown/header.s"
-	.include "data/maps/DewfordTown/header.s"
-	.include "data/maps/LavaridgeTown/header.s"
-	.include "data/maps/FallarborTown/header.s"
-	.include "data/maps/VerdanturfTown/header.s"
-	.include "data/maps/PacifidlogTown/header.s"
-	.include "data/maps/Route101/header.s"
-	.include "data/maps/Route102/header.s"
-	.include "data/maps/Route103/header.s"
-	.include "data/maps/Route104/header.s"
-	.include "data/maps/Route105/header.s"
-	.include "data/maps/Route106/header.s"
-	.include "data/maps/Route107/header.s"
-	.include "data/maps/Route108/header.s"
-	.include "data/maps/Route109/header.s"
-	.include "data/maps/Route110/header.s"
-	.include "data/maps/Route111/header.s"
-	.include "data/maps/Route112/header.s"
-	.include "data/maps/Route113/header.s"
-	.include "data/maps/Route114/header.s"
-	.include "data/maps/Route115/header.s"
-	.include "data/maps/Route116/header.s"
-	.include "data/maps/Route117/header.s"
-	.include "data/maps/Route118/header.s"
-	.include "data/maps/Route119/header.s"
-	.include "data/maps/Route120/header.s"
-	.include "data/maps/Route121/header.s"
-	.include "data/maps/Route122/header.s"
-	.include "data/maps/Route123/header.s"
-	.include "data/maps/Route124/header.s"
-	.include "data/maps/Route125/header.s"
-	.include "data/maps/Route126/header.s"
-	.include "data/maps/Route127/header.s"
-	.include "data/maps/Route128/header.s"
-	.include "data/maps/Route129/header.s"
-	.include "data/maps/Route130/header.s"
-	.include "data/maps/Route131/header.s"
-	.include "data/maps/Route132/header.s"
-	.include "data/maps/Route133/header.s"
-	.include "data/maps/Route134/header.s"
-	.include "data/maps/Underwater1/header.s"
-	.include "data/maps/Underwater2/header.s"
-	.include "data/maps/Underwater3/header.s"
-	.include "data/maps/Underwater4/header.s"
-	.include "data/maps/LittlerootTown_BrendansHouse_1F/header.s"
-	.include "data/maps/LittlerootTown_BrendansHouse_2F/header.s"
-	.include "data/maps/LittlerootTown_MaysHouse_1F/header.s"
-	.include "data/maps/LittlerootTown_MaysHouse_2F/header.s"
-	.include "data/maps/LittlerootTown_ProfessorBirchsLab/header.s"
-	.include "data/maps/OldaleTown_House1/header.s"
-	.include "data/maps/OldaleTown_House2/header.s"
-	.include "data/maps/OldaleTown_PokemonCenter_1F/header.s"
-	.include "data/maps/OldaleTown_PokemonCenter_2F/header.s"
-	.include "data/maps/OldaleTown_Mart/header.s"
-	.include "data/maps/DewfordTown_House1/header.s"
-	.include "data/maps/DewfordTown_PokemonCenter_1F/header.s"
-	.include "data/maps/DewfordTown_PokemonCenter_2F/header.s"
-	.include "data/maps/DewfordTown_Gym/header.s"
-	.include "data/maps/DewfordTown_Hall/header.s"
-	.include "data/maps/DewfordTown_House2/header.s"
-	.include "data/maps/LavaridgeTown_HerbShop/header.s"
-	.include "data/maps/LavaridgeTown_Gym_1F/header.s"
-	.include "data/maps/LavaridgeTown_Gym_B1F/header.s"
-	.include "data/maps/LavaridgeTown_House/header.s"
-	.include "data/maps/LavaridgeTown_Mart/header.s"
-	.include "data/maps/LavaridgeTown_PokemonCenter_1F/header.s"
-	.include "data/maps/LavaridgeTown_PokemonCenter_2F/header.s"
-	.include "data/maps/FallarborTown_Mart/header.s"
-	.include "data/maps/FallarborTown_ContestLobby/header.s"
-	.include "data/maps/FallarborTown_ContestHall/header.s"
-	.include "data/maps/FallarborTown_PokemonCenter_1F/header.s"
-	.include "data/maps/FallarborTown_PokemonCenter_2F/header.s"
-	.include "data/maps/FallarborTown_House1/header.s"
-	.include "data/maps/FallarborTown_House2/header.s"
-	.include "data/maps/VerdanturfTown_ContestLobby/header.s"
-	.include "data/maps/VerdanturfTown_ContestHall/header.s"
-	.include "data/maps/VerdanturfTown_Mart/header.s"
-	.include "data/maps/VerdanturfTown_PokemonCenter_1F/header.s"
-	.include "data/maps/VerdanturfTown_PokemonCenter_2F/header.s"
-	.include "data/maps/VerdanturfTown_WandasHouse/header.s"
-	.include "data/maps/VerdanturfTown_FriendshipRatersHouse/header.s"
-	.include "data/maps/VerdanturfTown_House/header.s"
-	.include "data/maps/PacifidlogTown_PokemonCenter_1F/header.s"
-	.include "data/maps/PacifidlogTown_PokemonCenter_2F/header.s"
-	.include "data/maps/PacifidlogTown_House1/header.s"
-	.include "data/maps/PacifidlogTown_House2/header.s"
-	.include "data/maps/PacifidlogTown_House3/header.s"
-	.include "data/maps/PacifidlogTown_House4/header.s"
-	.include "data/maps/PacifidlogTown_House5/header.s"
-	.include "data/maps/PetalburgCity_WallysHouse/header.s"
-	.include "data/maps/PetalburgCity_Gym/header.s"
-	.include "data/maps/PetalburgCity_House1/header.s"
-	.include "data/maps/PetalburgCity_House2/header.s"
-	.include "data/maps/PetalburgCity_PokemonCenter_1F/header.s"
-	.include "data/maps/PetalburgCity_PokemonCenter_2F/header.s"
-	.include "data/maps/PetalburgCity_Mart/header.s"
-	.include "data/maps/SlateportCity_SternsShipyard_1F/header.s"
-	.include "data/maps/SlateportCity_SternsShipyard_2F/header.s"
-	.include "data/maps/SlateportCity_ContestLobby/header.s"
-	.include "data/maps/SlateportCity_ContestHall/header.s"
-	.include "data/maps/SlateportCity_House1/header.s"
-	.include "data/maps/SlateportCity_PokemonFanClub/header.s"
-	.include "data/maps/SlateportCity_OceanicMuseum_1F/header.s"
-	.include "data/maps/SlateportCity_OceanicMuseum_2F/header.s"
-	.include "data/maps/SlateportCity_Harbor/header.s"
-	.include "data/maps/SlateportCity_House2/header.s"
-	.include "data/maps/SlateportCity_PokemonCenter_1F/header.s"
-	.include "data/maps/SlateportCity_PokemonCenter_2F/header.s"
-	.include "data/maps/SlateportCity_Mart/header.s"
-	.include "data/maps/MauvilleCity_Gym/header.s"
-	.include "data/maps/MauvilleCity_BikeShop/header.s"
-	.include "data/maps/MauvilleCity_House1/header.s"
-	.include "data/maps/MauvilleCity_GameCorner/header.s"
-	.include "data/maps/MauvilleCity_House2/header.s"
-	.include "data/maps/MauvilleCity_PokemonCenter_1F/header.s"
-	.include "data/maps/MauvilleCity_PokemonCenter_2F/header.s"
-	.include "data/maps/MauvilleCity_Mart/header.s"
-	.include "data/maps/RustboroCity_DevonCorp_1F/header.s"
-	.include "data/maps/RustboroCity_DevonCorp_2F/header.s"
-	.include "data/maps/RustboroCity_DevonCorp_3F/header.s"
-	.include "data/maps/RustboroCity_Gym/header.s"
-	.include "data/maps/RustboroCity_PokemonSchool/header.s"
-	.include "data/maps/RustboroCity_PokemonCenter_1F/header.s"
-	.include "data/maps/RustboroCity_PokemonCenter_2F/header.s"
-	.include "data/maps/RustboroCity_Mart/header.s"
-	.include "data/maps/RustboroCity_Flat1_1F/header.s"
-	.include "data/maps/RustboroCity_Flat1_2F/header.s"
-	.include "data/maps/RustboroCity_House1/header.s"
-	.include "data/maps/RustboroCity_CuttersHouse/header.s"
-	.include "data/maps/RustboroCity_House2/header.s"
-	.include "data/maps/RustboroCity_Flat2_1F/header.s"
-	.include "data/maps/RustboroCity_Flat2_2F/header.s"
-	.include "data/maps/RustboroCity_Flat2_3F/header.s"
-	.include "data/maps/RustboroCity_House3/header.s"
-	.include "data/maps/FortreeCity_House1/header.s"
-	.include "data/maps/FortreeCity_Gym/header.s"
-	.include "data/maps/FortreeCity_PokemonCenter_1F/header.s"
-	.include "data/maps/FortreeCity_PokemonCenter_2F/header.s"
-	.include "data/maps/FortreeCity_Mart/header.s"
-	.include "data/maps/FortreeCity_House2/header.s"
-	.include "data/maps/FortreeCity_House3/header.s"
-	.include "data/maps/FortreeCity_House4/header.s"
-	.include "data/maps/FortreeCity_House5/header.s"
-	.include "data/maps/FortreeCity_DecorationShop/header.s"
-	.include "data/maps/LilycoveCity_CoveLilyMotel_1F/header.s"
-	.include "data/maps/LilycoveCity_CoveLilyMotel_2F/header.s"
-	.include "data/maps/LilycoveCity_LilycoveMuseum_1F/header.s"
-	.include "data/maps/LilycoveCity_LilycoveMuseum_2F/header.s"
-	.include "data/maps/LilycoveCity_ContestLobby/header.s"
-	.include "data/maps/LilycoveCity_ContestHall/header.s"
-	.include "data/maps/LilycoveCity_PokemonCenter_1F/header.s"
-	.include "data/maps/LilycoveCity_PokemonCenter_2F/header.s"
-	.include "data/maps/LilycoveCity_UnusedMart/header.s"
-	.include "data/maps/LilycoveCity_PokemonTrainerFanClub/header.s"
-	.include "data/maps/LilycoveCity_Harbor/header.s"
-	.include "data/maps/LilycoveCity_EmptyMap/header.s"
-	.include "data/maps/LilycoveCity_MoveDeletersHouse/header.s"
-	.include "data/maps/LilycoveCity_House1/header.s"
-	.include "data/maps/LilycoveCity_House2/header.s"
-	.include "data/maps/LilycoveCity_House3/header.s"
-	.include "data/maps/LilycoveCity_House4/header.s"
-	.include "data/maps/LilycoveCity_DepartmentStore_1F/header.s"
-	.include "data/maps/LilycoveCity_DepartmentStore_2F/header.s"
-	.include "data/maps/LilycoveCity_DepartmentStore_3F/header.s"
-	.include "data/maps/LilycoveCity_DepartmentStore_4F/header.s"
-	.include "data/maps/LilycoveCity_DepartmentStore_5F/header.s"
-	.include "data/maps/LilycoveCity_DepartmentStoreRooftop/header.s"
-	.include "data/maps/LilycoveCity_DepartmentStoreElevator/header.s"
-	.include "data/maps/MossdeepCity_Gym/header.s"
-	.include "data/maps/MossdeepCity_House1/header.s"
-	.include "data/maps/MossdeepCity_House2/header.s"
-	.include "data/maps/MossdeepCity_PokemonCenter_1F/header.s"
-	.include "data/maps/MossdeepCity_PokemonCenter_2F/header.s"
-	.include "data/maps/MossdeepCity_Mart/header.s"
-	.include "data/maps/MossdeepCity_House3/header.s"
-	.include "data/maps/MossdeepCity_StevensHouse/header.s"
-	.include "data/maps/MossdeepCity_House4/header.s"
-	.include "data/maps/MossdeepCity_SpaceCenter_1F/header.s"
-	.include "data/maps/MossdeepCity_SpaceCenter_2F/header.s"
-	.include "data/maps/MossdeepCity_GameCorner_1F/header.s"
-	.include "data/maps/MossdeepCity_GameCorner_B1F/header.s"
-	.include "data/maps/SootopolisCity_Gym_1F/header.s"
-	.include "data/maps/SootopolisCity_Gym_B1F/header.s"
-	.include "data/maps/SootopolisCity_PokemonCenter_1F/header.s"
-	.include "data/maps/SootopolisCity_PokemonCenter_2F/header.s"
-	.include "data/maps/SootopolisCity_Mart/header.s"
-	.include "data/maps/SootopolisCity_House1/header.s"
-	.include "data/maps/SootopolisCity_House2/header.s"
-	.include "data/maps/SootopolisCity_House3/header.s"
-	.include "data/maps/SootopolisCity_House4/header.s"
-	.include "data/maps/SootopolisCity_House5/header.s"
-	.include "data/maps/SootopolisCity_House6/header.s"
-	.include "data/maps/SootopolisCity_House7/header.s"
-	.include "data/maps/SootopolisCity_House8/header.s"
-	.include "data/maps/EverGrandeCity_SidneysRoom/header.s"
-	.include "data/maps/EverGrandeCity_PhoebesRoom/header.s"
-	.include "data/maps/EverGrandeCity_GlaciasRoom/header.s"
-	.include "data/maps/EverGrandeCity_DrakesRoom/header.s"
-	.include "data/maps/EverGrandeCity_ChampionsRoom/header.s"
-	.include "data/maps/EverGrandeCity_Corridor1/header.s"
-	.include "data/maps/EverGrandeCity_Corridor2/header.s"
-	.include "data/maps/EverGrandeCity_Corridor3/header.s"
-	.include "data/maps/EverGrandeCity_Corridor4/header.s"
-	.include "data/maps/EverGrandeCity_Corridor5/header.s"
-	.include "data/maps/EverGrandeCity_PokemonLeague/header.s"
-	.include "data/maps/EverGrandeCity_HallOfFame/header.s"
-	.include "data/maps/EverGrandeCity_PokemonCenter_1F/header.s"
-	.include "data/maps/EverGrandeCity_PokemonCenter_2F/header.s"
-	.include "data/maps/Route104_MrBrineysHouse/header.s"
-	.include "data/maps/Route104_PrettyPetalFlowerShop/header.s"
-	.include "data/maps/Route111_WinstrateFamilysHouse/header.s"
-	.include "data/maps/Route111_OldLadysRestStop/header.s"
-	.include "data/maps/Route112_CableCarStation/header.s"
-	.include "data/maps/MtChimney_CableCarStation/header.s"
-	.include "data/maps/Route114_FossilManiacsHouse/header.s"
-	.include "data/maps/Route114_FossilManiacsTunnel/header.s"
-	.include "data/maps/Route114_LanettesHouse/header.s"
-	.include "data/maps/Route116_TunnelersRestHouse/header.s"
-	.include "data/maps/Route117_PokemonDayCare/header.s"
-	.include "data/maps/Route121_SafariZoneEntrance/header.s"
-	.include "data/maps/MeteorFalls_1F_1R/header.s"
-	.include "data/maps/MeteorFalls_1F_2R/header.s"
-	.include "data/maps/MeteorFalls_B1F_1R/header.s"
-	.include "data/maps/MeteorFalls_B1F_2R/header.s"
-	.include "data/maps/RusturfTunnel/header.s"
-	.include "data/maps/Underwater_SootopolisCity/header.s"
-	.include "data/maps/DesertRuins/header.s"
-	.include "data/maps/GraniteCave_1F/header.s"
-	.include "data/maps/GraniteCave_B1F/header.s"
-	.include "data/maps/GraniteCave_B2F/header.s"
-	.include "data/maps/GraniteCave_StevensRoom/header.s"
-	.include "data/maps/PetalburgWoods/header.s"
-	.include "data/maps/MtChimney/header.s"
-	.include "data/maps/JaggedPass/header.s"
-	.include "data/maps/FieryPath/header.s"
-	.include "data/maps/MtPyre_1F/header.s"
-	.include "data/maps/MtPyre_2F/header.s"
-	.include "data/maps/MtPyre_3F/header.s"
-	.include "data/maps/MtPyre_4F/header.s"
-	.include "data/maps/MtPyre_5F/header.s"
-	.include "data/maps/MtPyre_6F/header.s"
-	.include "data/maps/MtPyre_Exterior/header.s"
-	.include "data/maps/MtPyre_Summit/header.s"
-	.include "data/maps/AquaHideout_1F/header.s"
-	.include "data/maps/AquaHideout_B1F/header.s"
-	.include "data/maps/AquaHideout_B2F/header.s"
-	.include "data/maps/Underwater_SeafloorCavern/header.s"
-	.include "data/maps/SeafloorCavern_Entrance/header.s"
-	.include "data/maps/SeafloorCavern_Room1/header.s"
-	.include "data/maps/SeafloorCavern_Room2/header.s"
-	.include "data/maps/SeafloorCavern_Room3/header.s"
-	.include "data/maps/SeafloorCavern_Room4/header.s"
-	.include "data/maps/SeafloorCavern_Room5/header.s"
-	.include "data/maps/SeafloorCavern_Room6/header.s"
-	.include "data/maps/SeafloorCavern_Room7/header.s"
-	.include "data/maps/SeafloorCavern_Room8/header.s"
-	.include "data/maps/SeafloorCavern_Room9/header.s"
-	.include "data/maps/CaveOfOrigin_Entrance/header.s"
-	.include "data/maps/CaveOfOrigin_1F/header.s"
-	.include "data/maps/CaveOfOrigin_B1F/header.s"
-	.include "data/maps/CaveOfOrigin_B2F/header.s"
-	.include "data/maps/CaveOfOrigin_B3F/header.s"
-	.include "data/maps/CaveOfOrigin_B4F/header.s"
-	.include "data/maps/VictoryRoad_1F/header.s"
-	.include "data/maps/VictoryRoad_B1F/header.s"
-	.include "data/maps/VictoryRoad_B2F/header.s"
-	.include "data/maps/ShoalCave_LowTideEntranceRoom/header.s"
-	.include "data/maps/ShoalCave_LowTideInnerRoom/header.s"
-	.include "data/maps/ShoalCave_LowTideStairsRoom/header.s"
-	.include "data/maps/ShoalCave_LowTideLowerRoom/header.s"
-	.include "data/maps/ShoalCave_HighTideEntranceRoom/header.s"
-	.include "data/maps/ShoalCave_HighTideInnerRoom/header.s"
-	.include "data/maps/NewMauville_Entrance/header.s"
-	.include "data/maps/NewMauville_Inside/header.s"
-	.include "data/maps/AbandonedShip_Deck/header.s"
-	.include "data/maps/AbandonedShip_Corridors_1F/header.s"
-	.include "data/maps/AbandonedShip_Rooms_1F/header.s"
-	.include "data/maps/AbandonedShip_Corridors_B1F/header.s"
-	.include "data/maps/AbandonedShip_Rooms_B1F/header.s"
-	.include "data/maps/AbandonedShip_Rooms2_B1F/header.s"
-	.include "data/maps/AbandonedShip_Underwater1/header.s"
-	.include "data/maps/AbandonedShip_Room_B1F/header.s"
-	.include "data/maps/AbandonedShip_Rooms2_1F/header.s"
-	.include "data/maps/AbandonedShip_CaptainsOffice/header.s"
-	.include "data/maps/AbandonedShip_Underwater2/header.s"
-	.include "data/maps/AbandonedShip_HiddenFloorCorridors/header.s"
-	.include "data/maps/AbandonedShip_HiddenFloorRooms/header.s"
-	.include "data/maps/IslandCave/header.s"
-	.include "data/maps/AncientTomb/header.s"
-	.include "data/maps/Underwater_Route134/header.s"
-	.include "data/maps/Underwater_SealedChamber/header.s"
-	.include "data/maps/SealedChamber_OuterRoom/header.s"
-	.include "data/maps/SealedChamber_InnerRoom/header.s"
-	.include "data/maps/ScorchedSlab/header.s"
-	.include "data/maps/MagmaHideout_1F/header.s"
-	.include "data/maps/MagmaHideout_B1F/header.s"
-	.include "data/maps/MagmaHideout_B2F/header.s"
-	.include "data/maps/SkyPillar_Entrance/header.s"
-	.include "data/maps/SkyPillar_Outside/header.s"
-	.include "data/maps/SkyPillar_1F/header.s"
-	.include "data/maps/SkyPillar_2F/header.s"
-	.include "data/maps/SkyPillar_3F/header.s"
-	.include "data/maps/SkyPillar_4F/header.s"
-	.include "data/maps/ShoalCave_LowTideIceRoom/header.s"
-	.include "data/maps/SkyPillar_5F/header.s"
-	.include "data/maps/SkyPillar_Top/header.s"
-	.include "data/maps/SecretBase_RedCave1/header.s"
-	.include "data/maps/SecretBase_BrownCave1/header.s"
-	.include "data/maps/SecretBase_BlueCave1/header.s"
-	.include "data/maps/SecretBase_YellowCave1/header.s"
-	.include "data/maps/SecretBase_Tree1/header.s"
-	.include "data/maps/SecretBase_Shrub1/header.s"
-	.include "data/maps/SecretBase_RedCave2/header.s"
-	.include "data/maps/SecretBase_BrownCave2/header.s"
-	.include "data/maps/SecretBase_BlueCave2/header.s"
-	.include "data/maps/SecretBase_YellowCave2/header.s"
-	.include "data/maps/SecretBase_Tree2/header.s"
-	.include "data/maps/SecretBase_Shrub2/header.s"
-	.include "data/maps/SecretBase_RedCave3/header.s"
-	.include "data/maps/SecretBase_BrownCave3/header.s"
-	.include "data/maps/SecretBase_BlueCave3/header.s"
-	.include "data/maps/SecretBase_YellowCave3/header.s"
-	.include "data/maps/SecretBase_Tree3/header.s"
-	.include "data/maps/SecretBase_Shrub3/header.s"
-	.include "data/maps/SecretBase_RedCave4/header.s"
-	.include "data/maps/SecretBase_BrownCave4/header.s"
-	.include "data/maps/SecretBase_BlueCave4/header.s"
-	.include "data/maps/SecretBase_YellowCave4/header.s"
-	.include "data/maps/SecretBase_Tree4/header.s"
-	.include "data/maps/SecretBase_Shrub4/header.s"
-	.include "data/maps/SingleBattleColosseum/header.s"
-	.include "data/maps/TradeCenter/header.s"
-	.include "data/maps/RecordCorner/header.s"
-	.include "data/maps/DoubleBattleColosseum/header.s"
-	.include "data/maps/LinkContestRoom1/header.s"
-	.include "data/maps/UnknownMap_25_29/header.s"
-	.include "data/maps/UnknownMap_25_30/header.s"
-	.include "data/maps/UnknownMap_25_31/header.s"
-	.include "data/maps/UnknownMap_25_32/header.s"
-	.include "data/maps/UnknownMap_25_33/header.s"
-	.include "data/maps/UnknownMap_25_34/header.s"
-	.include "data/maps/LinkContestRoom2/header.s"
-	.include "data/maps/LinkContestRoom3/header.s"
-	.include "data/maps/LinkContestRoom4/header.s"
-	.include "data/maps/LinkContestRoom5/header.s"
-	.include "data/maps/LinkContestRoom6/header.s"
-	.include "data/maps/InsideOfTruck/header.s"
-	.include "data/maps/SSTidalCorridor/header.s"
-	.include "data/maps/SSTidalLowerDeck/header.s"
-	.include "data/maps/SSTidalRooms/header.s"
-	.include "data/maps/SafariZone_Northwest/header.s"
-	.include "data/maps/SafariZone_Northeast/header.s"
-	.include "data/maps/SafariZone_Southwest/header.s"
-	.include "data/maps/SafariZone_Southeast/header.s"
-	.include "data/maps/BattleTower_Outside/header.s"
-	.include "data/maps/BattleTower_Lobby/header.s"
-	.include "data/maps/BattleTower_Elevator/header.s"
-	.include "data/maps/BattleTower_Corridor/header.s"
-	.include "data/maps/BattleTower_BattleRoom/header.s"
-	.include "data/maps/SouthernIsland_Exterior/header.s"
-	.include "data/maps/SouthernIsland_Interior/header.s"
-	.include "data/maps/SafariZone_RestHouse/header.s"
-	.include "data/maps/Route104_Prototype/header.s"
-	.include "data/maps/Route104_PrototypePrettyPetalFlowerShop/header.s"
-	.include "data/maps/Route109_SeashoreHouse/header.s"
-	.include "data/maps/Route110_TrickHouseEntrance/header.s"
-	.include "data/maps/Route110_TrickHouseEnd/header.s"
-	.include "data/maps/Route110_TrickHouseCorridor/header.s"
-	.include "data/maps/Route110_TrickHousePuzzle1/header.s"
-	.include "data/maps/Route110_TrickHousePuzzle2/header.s"
-	.include "data/maps/Route110_TrickHousePuzzle3/header.s"
-	.include "data/maps/Route110_TrickHousePuzzle4/header.s"
-	.include "data/maps/Route110_TrickHousePuzzle5/header.s"
-	.include "data/maps/Route110_TrickHousePuzzle6/header.s"
-	.include "data/maps/Route110_TrickHousePuzzle7/header.s"
-	.include "data/maps/Route110_TrickHousePuzzle8/header.s"
-	.include "data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.s"
-	.include "data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.s"
-	.include "data/maps/Route113_GlassWorkshop/header.s"
-	.include "data/maps/Route123_BerryMastersHouse/header.s"
-	.include "data/maps/Route119_WeatherInstitute_1F/header.s"
-	.include "data/maps/Route119_WeatherInstitute_2F/header.s"
-	.include "data/maps/Route119_House/header.s"
-	.include "data/maps/Route124_DivingTreasureHuntersHouse/header.s"
+	.include "data/maps/PetalburgCity/header.inc"
+	.include "data/maps/SlateportCity/header.inc"
+	.include "data/maps/MauvilleCity/header.inc"
+	.include "data/maps/RustboroCity/header.inc"
+	.include "data/maps/FortreeCity/header.inc"
+	.include "data/maps/LilycoveCity/header.inc"
+	.include "data/maps/MossdeepCity/header.inc"
+	.include "data/maps/SootopolisCity/header.inc"
+	.include "data/maps/EverGrandeCity/header.inc"
+	.include "data/maps/LittlerootTown/header.inc"
+	.include "data/maps/OldaleTown/header.inc"
+	.include "data/maps/DewfordTown/header.inc"
+	.include "data/maps/LavaridgeTown/header.inc"
+	.include "data/maps/FallarborTown/header.inc"
+	.include "data/maps/VerdanturfTown/header.inc"
+	.include "data/maps/PacifidlogTown/header.inc"
+	.include "data/maps/Route101/header.inc"
+	.include "data/maps/Route102/header.inc"
+	.include "data/maps/Route103/header.inc"
+	.include "data/maps/Route104/header.inc"
+	.include "data/maps/Route105/header.inc"
+	.include "data/maps/Route106/header.inc"
+	.include "data/maps/Route107/header.inc"
+	.include "data/maps/Route108/header.inc"
+	.include "data/maps/Route109/header.inc"
+	.include "data/maps/Route110/header.inc"
+	.include "data/maps/Route111/header.inc"
+	.include "data/maps/Route112/header.inc"
+	.include "data/maps/Route113/header.inc"
+	.include "data/maps/Route114/header.inc"
+	.include "data/maps/Route115/header.inc"
+	.include "data/maps/Route116/header.inc"
+	.include "data/maps/Route117/header.inc"
+	.include "data/maps/Route118/header.inc"
+	.include "data/maps/Route119/header.inc"
+	.include "data/maps/Route120/header.inc"
+	.include "data/maps/Route121/header.inc"
+	.include "data/maps/Route122/header.inc"
+	.include "data/maps/Route123/header.inc"
+	.include "data/maps/Route124/header.inc"
+	.include "data/maps/Route125/header.inc"
+	.include "data/maps/Route126/header.inc"
+	.include "data/maps/Route127/header.inc"
+	.include "data/maps/Route128/header.inc"
+	.include "data/maps/Route129/header.inc"
+	.include "data/maps/Route130/header.inc"
+	.include "data/maps/Route131/header.inc"
+	.include "data/maps/Route132/header.inc"
+	.include "data/maps/Route133/header.inc"
+	.include "data/maps/Route134/header.inc"
+	.include "data/maps/Underwater1/header.inc"
+	.include "data/maps/Underwater2/header.inc"
+	.include "data/maps/Underwater3/header.inc"
+	.include "data/maps/Underwater4/header.inc"
+	.include "data/maps/LittlerootTown_BrendansHouse_1F/header.inc"
+	.include "data/maps/LittlerootTown_BrendansHouse_2F/header.inc"
+	.include "data/maps/LittlerootTown_MaysHouse_1F/header.inc"
+	.include "data/maps/LittlerootTown_MaysHouse_2F/header.inc"
+	.include "data/maps/LittlerootTown_ProfessorBirchsLab/header.inc"
+	.include "data/maps/OldaleTown_House1/header.inc"
+	.include "data/maps/OldaleTown_House2/header.inc"
+	.include "data/maps/OldaleTown_PokemonCenter_1F/header.inc"
+	.include "data/maps/OldaleTown_PokemonCenter_2F/header.inc"
+	.include "data/maps/OldaleTown_Mart/header.inc"
+	.include "data/maps/DewfordTown_House1/header.inc"
+	.include "data/maps/DewfordTown_PokemonCenter_1F/header.inc"
+	.include "data/maps/DewfordTown_PokemonCenter_2F/header.inc"
+	.include "data/maps/DewfordTown_Gym/header.inc"
+	.include "data/maps/DewfordTown_Hall/header.inc"
+	.include "data/maps/DewfordTown_House2/header.inc"
+	.include "data/maps/LavaridgeTown_HerbShop/header.inc"
+	.include "data/maps/LavaridgeTown_Gym_1F/header.inc"
+	.include "data/maps/LavaridgeTown_Gym_B1F/header.inc"
+	.include "data/maps/LavaridgeTown_House/header.inc"
+	.include "data/maps/LavaridgeTown_Mart/header.inc"
+	.include "data/maps/LavaridgeTown_PokemonCenter_1F/header.inc"
+	.include "data/maps/LavaridgeTown_PokemonCenter_2F/header.inc"
+	.include "data/maps/FallarborTown_Mart/header.inc"
+	.include "data/maps/FallarborTown_ContestLobby/header.inc"
+	.include "data/maps/FallarborTown_ContestHall/header.inc"
+	.include "data/maps/FallarborTown_PokemonCenter_1F/header.inc"
+	.include "data/maps/FallarborTown_PokemonCenter_2F/header.inc"
+	.include "data/maps/FallarborTown_House1/header.inc"
+	.include "data/maps/FallarborTown_House2/header.inc"
+	.include "data/maps/VerdanturfTown_ContestLobby/header.inc"
+	.include "data/maps/VerdanturfTown_ContestHall/header.inc"
+	.include "data/maps/VerdanturfTown_Mart/header.inc"
+	.include "data/maps/VerdanturfTown_PokemonCenter_1F/header.inc"
+	.include "data/maps/VerdanturfTown_PokemonCenter_2F/header.inc"
+	.include "data/maps/VerdanturfTown_WandasHouse/header.inc"
+	.include "data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc"
+	.include "data/maps/VerdanturfTown_House/header.inc"
+	.include "data/maps/PacifidlogTown_PokemonCenter_1F/header.inc"
+	.include "data/maps/PacifidlogTown_PokemonCenter_2F/header.inc"
+	.include "data/maps/PacifidlogTown_House1/header.inc"
+	.include "data/maps/PacifidlogTown_House2/header.inc"
+	.include "data/maps/PacifidlogTown_House3/header.inc"
+	.include "data/maps/PacifidlogTown_House4/header.inc"
+	.include "data/maps/PacifidlogTown_House5/header.inc"
+	.include "data/maps/PetalburgCity_WallysHouse/header.inc"
+	.include "data/maps/PetalburgCity_Gym/header.inc"
+	.include "data/maps/PetalburgCity_House1/header.inc"
+	.include "data/maps/PetalburgCity_House2/header.inc"
+	.include "data/maps/PetalburgCity_PokemonCenter_1F/header.inc"
+	.include "data/maps/PetalburgCity_PokemonCenter_2F/header.inc"
+	.include "data/maps/PetalburgCity_Mart/header.inc"
+	.include "data/maps/SlateportCity_SternsShipyard_1F/header.inc"
+	.include "data/maps/SlateportCity_SternsShipyard_2F/header.inc"
+	.include "data/maps/SlateportCity_ContestLobby/header.inc"
+	.include "data/maps/SlateportCity_ContestHall/header.inc"
+	.include "data/maps/SlateportCity_House1/header.inc"
+	.include "data/maps/SlateportCity_PokemonFanClub/header.inc"
+	.include "data/maps/SlateportCity_OceanicMuseum_1F/header.inc"
+	.include "data/maps/SlateportCity_OceanicMuseum_2F/header.inc"
+	.include "data/maps/SlateportCity_Harbor/header.inc"
+	.include "data/maps/SlateportCity_House2/header.inc"
+	.include "data/maps/SlateportCity_PokemonCenter_1F/header.inc"
+	.include "data/maps/SlateportCity_PokemonCenter_2F/header.inc"
+	.include "data/maps/SlateportCity_Mart/header.inc"
+	.include "data/maps/MauvilleCity_Gym/header.inc"
+	.include "data/maps/MauvilleCity_BikeShop/header.inc"
+	.include "data/maps/MauvilleCity_House1/header.inc"
+	.include "data/maps/MauvilleCity_GameCorner/header.inc"
+	.include "data/maps/MauvilleCity_House2/header.inc"
+	.include "data/maps/MauvilleCity_PokemonCenter_1F/header.inc"
+	.include "data/maps/MauvilleCity_PokemonCenter_2F/header.inc"
+	.include "data/maps/MauvilleCity_Mart/header.inc"
+	.include "data/maps/RustboroCity_DevonCorp_1F/header.inc"
+	.include "data/maps/RustboroCity_DevonCorp_2F/header.inc"
+	.include "data/maps/RustboroCity_DevonCorp_3F/header.inc"
+	.include "data/maps/RustboroCity_Gym/header.inc"
+	.include "data/maps/RustboroCity_PokemonSchool/header.inc"
+	.include "data/maps/RustboroCity_PokemonCenter_1F/header.inc"
+	.include "data/maps/RustboroCity_PokemonCenter_2F/header.inc"
+	.include "data/maps/RustboroCity_Mart/header.inc"
+	.include "data/maps/RustboroCity_Flat1_1F/header.inc"
+	.include "data/maps/RustboroCity_Flat1_2F/header.inc"
+	.include "data/maps/RustboroCity_House1/header.inc"
+	.include "data/maps/RustboroCity_CuttersHouse/header.inc"
+	.include "data/maps/RustboroCity_House2/header.inc"
+	.include "data/maps/RustboroCity_Flat2_1F/header.inc"
+	.include "data/maps/RustboroCity_Flat2_2F/header.inc"
+	.include "data/maps/RustboroCity_Flat2_3F/header.inc"
+	.include "data/maps/RustboroCity_House3/header.inc"
+	.include "data/maps/FortreeCity_House1/header.inc"
+	.include "data/maps/FortreeCity_Gym/header.inc"
+	.include "data/maps/FortreeCity_PokemonCenter_1F/header.inc"
+	.include "data/maps/FortreeCity_PokemonCenter_2F/header.inc"
+	.include "data/maps/FortreeCity_Mart/header.inc"
+	.include "data/maps/FortreeCity_House2/header.inc"
+	.include "data/maps/FortreeCity_House3/header.inc"
+	.include "data/maps/FortreeCity_House4/header.inc"
+	.include "data/maps/FortreeCity_House5/header.inc"
+	.include "data/maps/FortreeCity_DecorationShop/header.inc"
+	.include "data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc"
+	.include "data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc"
+	.include "data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc"
+	.include "data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc"
+	.include "data/maps/LilycoveCity_ContestLobby/header.inc"
+	.include "data/maps/LilycoveCity_ContestHall/header.inc"
+	.include "data/maps/LilycoveCity_PokemonCenter_1F/header.inc"
+	.include "data/maps/LilycoveCity_PokemonCenter_2F/header.inc"
+	.include "data/maps/LilycoveCity_UnusedMart/header.inc"
+	.include "data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc"
+	.include "data/maps/LilycoveCity_Harbor/header.inc"
+	.include "data/maps/LilycoveCity_EmptyMap/header.inc"
+	.include "data/maps/LilycoveCity_MoveDeletersHouse/header.inc"
+	.include "data/maps/LilycoveCity_House1/header.inc"
+	.include "data/maps/LilycoveCity_House2/header.inc"
+	.include "data/maps/LilycoveCity_House3/header.inc"
+	.include "data/maps/LilycoveCity_House4/header.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_1F/header.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_2F/header.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_3F/header.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_4F/header.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_5F/header.inc"
+	.include "data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc"
+	.include "data/maps/LilycoveCity_DepartmentStoreElevator/header.inc"
+	.include "data/maps/MossdeepCity_Gym/header.inc"
+	.include "data/maps/MossdeepCity_House1/header.inc"
+	.include "data/maps/MossdeepCity_House2/header.inc"
+	.include "data/maps/MossdeepCity_PokemonCenter_1F/header.inc"
+	.include "data/maps/MossdeepCity_PokemonCenter_2F/header.inc"
+	.include "data/maps/MossdeepCity_Mart/header.inc"
+	.include "data/maps/MossdeepCity_House3/header.inc"
+	.include "data/maps/MossdeepCity_StevensHouse/header.inc"
+	.include "data/maps/MossdeepCity_House4/header.inc"
+	.include "data/maps/MossdeepCity_SpaceCenter_1F/header.inc"
+	.include "data/maps/MossdeepCity_SpaceCenter_2F/header.inc"
+	.include "data/maps/MossdeepCity_GameCorner_1F/header.inc"
+	.include "data/maps/MossdeepCity_GameCorner_B1F/header.inc"
+	.include "data/maps/SootopolisCity_Gym_1F/header.inc"
+	.include "data/maps/SootopolisCity_Gym_B1F/header.inc"
+	.include "data/maps/SootopolisCity_PokemonCenter_1F/header.inc"
+	.include "data/maps/SootopolisCity_PokemonCenter_2F/header.inc"
+	.include "data/maps/SootopolisCity_Mart/header.inc"
+	.include "data/maps/SootopolisCity_House1/header.inc"
+	.include "data/maps/SootopolisCity_House2/header.inc"
+	.include "data/maps/SootopolisCity_House3/header.inc"
+	.include "data/maps/SootopolisCity_House4/header.inc"
+	.include "data/maps/SootopolisCity_House5/header.inc"
+	.include "data/maps/SootopolisCity_House6/header.inc"
+	.include "data/maps/SootopolisCity_House7/header.inc"
+	.include "data/maps/SootopolisCity_House8/header.inc"
+	.include "data/maps/EverGrandeCity_SidneysRoom/header.inc"
+	.include "data/maps/EverGrandeCity_PhoebesRoom/header.inc"
+	.include "data/maps/EverGrandeCity_GlaciasRoom/header.inc"
+	.include "data/maps/EverGrandeCity_DrakesRoom/header.inc"
+	.include "data/maps/EverGrandeCity_ChampionsRoom/header.inc"
+	.include "data/maps/EverGrandeCity_Corridor1/header.inc"
+	.include "data/maps/EverGrandeCity_Corridor2/header.inc"
+	.include "data/maps/EverGrandeCity_Corridor3/header.inc"
+	.include "data/maps/EverGrandeCity_Corridor4/header.inc"
+	.include "data/maps/EverGrandeCity_Corridor5/header.inc"
+	.include "data/maps/EverGrandeCity_PokemonLeague/header.inc"
+	.include "data/maps/EverGrandeCity_HallOfFame/header.inc"
+	.include "data/maps/EverGrandeCity_PokemonCenter_1F/header.inc"
+	.include "data/maps/EverGrandeCity_PokemonCenter_2F/header.inc"
+	.include "data/maps/Route104_MrBrineysHouse/header.inc"
+	.include "data/maps/Route104_PrettyPetalFlowerShop/header.inc"
+	.include "data/maps/Route111_WinstrateFamilysHouse/header.inc"
+	.include "data/maps/Route111_OldLadysRestStop/header.inc"
+	.include "data/maps/Route112_CableCarStation/header.inc"
+	.include "data/maps/MtChimney_CableCarStation/header.inc"
+	.include "data/maps/Route114_FossilManiacsHouse/header.inc"
+	.include "data/maps/Route114_FossilManiacsTunnel/header.inc"
+	.include "data/maps/Route114_LanettesHouse/header.inc"
+	.include "data/maps/Route116_TunnelersRestHouse/header.inc"
+	.include "data/maps/Route117_PokemonDayCare/header.inc"
+	.include "data/maps/Route121_SafariZoneEntrance/header.inc"
+	.include "data/maps/MeteorFalls_1F_1R/header.inc"
+	.include "data/maps/MeteorFalls_1F_2R/header.inc"
+	.include "data/maps/MeteorFalls_B1F_1R/header.inc"
+	.include "data/maps/MeteorFalls_B1F_2R/header.inc"
+	.include "data/maps/RusturfTunnel/header.inc"
+	.include "data/maps/Underwater_SootopolisCity/header.inc"
+	.include "data/maps/DesertRuins/header.inc"
+	.include "data/maps/GraniteCave_1F/header.inc"
+	.include "data/maps/GraniteCave_B1F/header.inc"
+	.include "data/maps/GraniteCave_B2F/header.inc"
+	.include "data/maps/GraniteCave_StevensRoom/header.inc"
+	.include "data/maps/PetalburgWoods/header.inc"
+	.include "data/maps/MtChimney/header.inc"
+	.include "data/maps/JaggedPass/header.inc"
+	.include "data/maps/FieryPath/header.inc"
+	.include "data/maps/MtPyre_1F/header.inc"
+	.include "data/maps/MtPyre_2F/header.inc"
+	.include "data/maps/MtPyre_3F/header.inc"
+	.include "data/maps/MtPyre_4F/header.inc"
+	.include "data/maps/MtPyre_5F/header.inc"
+	.include "data/maps/MtPyre_6F/header.inc"
+	.include "data/maps/MtPyre_Exterior/header.inc"
+	.include "data/maps/MtPyre_Summit/header.inc"
+	.include "data/maps/AquaHideout_1F/header.inc"
+	.include "data/maps/AquaHideout_B1F/header.inc"
+	.include "data/maps/AquaHideout_B2F/header.inc"
+	.include "data/maps/Underwater_SeafloorCavern/header.inc"
+	.include "data/maps/SeafloorCavern_Entrance/header.inc"
+	.include "data/maps/SeafloorCavern_Room1/header.inc"
+	.include "data/maps/SeafloorCavern_Room2/header.inc"
+	.include "data/maps/SeafloorCavern_Room3/header.inc"
+	.include "data/maps/SeafloorCavern_Room4/header.inc"
+	.include "data/maps/SeafloorCavern_Room5/header.inc"
+	.include "data/maps/SeafloorCavern_Room6/header.inc"
+	.include "data/maps/SeafloorCavern_Room7/header.inc"
+	.include "data/maps/SeafloorCavern_Room8/header.inc"
+	.include "data/maps/SeafloorCavern_Room9/header.inc"
+	.include "data/maps/CaveOfOrigin_Entrance/header.inc"
+	.include "data/maps/CaveOfOrigin_1F/header.inc"
+	.include "data/maps/CaveOfOrigin_B1F/header.inc"
+	.include "data/maps/CaveOfOrigin_B2F/header.inc"
+	.include "data/maps/CaveOfOrigin_B3F/header.inc"
+	.include "data/maps/CaveOfOrigin_B4F/header.inc"
+	.include "data/maps/VictoryRoad_1F/header.inc"
+	.include "data/maps/VictoryRoad_B1F/header.inc"
+	.include "data/maps/VictoryRoad_B2F/header.inc"
+	.include "data/maps/ShoalCave_LowTideEntranceRoom/header.inc"
+	.include "data/maps/ShoalCave_LowTideInnerRoom/header.inc"
+	.include "data/maps/ShoalCave_LowTideStairsRoom/header.inc"
+	.include "data/maps/ShoalCave_LowTideLowerRoom/header.inc"
+	.include "data/maps/ShoalCave_HighTideEntranceRoom/header.inc"
+	.include "data/maps/ShoalCave_HighTideInnerRoom/header.inc"
+	.include "data/maps/NewMauville_Entrance/header.inc"
+	.include "data/maps/NewMauville_Inside/header.inc"
+	.include "data/maps/AbandonedShip_Deck/header.inc"
+	.include "data/maps/AbandonedShip_Corridors_1F/header.inc"
+	.include "data/maps/AbandonedShip_Rooms_1F/header.inc"
+	.include "data/maps/AbandonedShip_Corridors_B1F/header.inc"
+	.include "data/maps/AbandonedShip_Rooms_B1F/header.inc"
+	.include "data/maps/AbandonedShip_Rooms2_B1F/header.inc"
+	.include "data/maps/AbandonedShip_Underwater1/header.inc"
+	.include "data/maps/AbandonedShip_Room_B1F/header.inc"
+	.include "data/maps/AbandonedShip_Rooms2_1F/header.inc"
+	.include "data/maps/AbandonedShip_CaptainsOffice/header.inc"
+	.include "data/maps/AbandonedShip_Underwater2/header.inc"
+	.include "data/maps/AbandonedShip_HiddenFloorCorridors/header.inc"
+	.include "data/maps/AbandonedShip_HiddenFloorRooms/header.inc"
+	.include "data/maps/IslandCave/header.inc"
+	.include "data/maps/AncientTomb/header.inc"
+	.include "data/maps/Underwater_Route134/header.inc"
+	.include "data/maps/Underwater_SealedChamber/header.inc"
+	.include "data/maps/SealedChamber_OuterRoom/header.inc"
+	.include "data/maps/SealedChamber_InnerRoom/header.inc"
+	.include "data/maps/ScorchedSlab/header.inc"
+	.include "data/maps/MagmaHideout_1F/header.inc"
+	.include "data/maps/MagmaHideout_B1F/header.inc"
+	.include "data/maps/MagmaHideout_B2F/header.inc"
+	.include "data/maps/SkyPillar_Entrance/header.inc"
+	.include "data/maps/SkyPillar_Outside/header.inc"
+	.include "data/maps/SkyPillar_1F/header.inc"
+	.include "data/maps/SkyPillar_2F/header.inc"
+	.include "data/maps/SkyPillar_3F/header.inc"
+	.include "data/maps/SkyPillar_4F/header.inc"
+	.include "data/maps/ShoalCave_LowTideIceRoom/header.inc"
+	.include "data/maps/SkyPillar_5F/header.inc"
+	.include "data/maps/SkyPillar_Top/header.inc"
+	.include "data/maps/SecretBase_RedCave1/header.inc"
+	.include "data/maps/SecretBase_BrownCave1/header.inc"
+	.include "data/maps/SecretBase_BlueCave1/header.inc"
+	.include "data/maps/SecretBase_YellowCave1/header.inc"
+	.include "data/maps/SecretBase_Tree1/header.inc"
+	.include "data/maps/SecretBase_Shrub1/header.inc"
+	.include "data/maps/SecretBase_RedCave2/header.inc"
+	.include "data/maps/SecretBase_BrownCave2/header.inc"
+	.include "data/maps/SecretBase_BlueCave2/header.inc"
+	.include "data/maps/SecretBase_YellowCave2/header.inc"
+	.include "data/maps/SecretBase_Tree2/header.inc"
+	.include "data/maps/SecretBase_Shrub2/header.inc"
+	.include "data/maps/SecretBase_RedCave3/header.inc"
+	.include "data/maps/SecretBase_BrownCave3/header.inc"
+	.include "data/maps/SecretBase_BlueCave3/header.inc"
+	.include "data/maps/SecretBase_YellowCave3/header.inc"
+	.include "data/maps/SecretBase_Tree3/header.inc"
+	.include "data/maps/SecretBase_Shrub3/header.inc"
+	.include "data/maps/SecretBase_RedCave4/header.inc"
+	.include "data/maps/SecretBase_BrownCave4/header.inc"
+	.include "data/maps/SecretBase_BlueCave4/header.inc"
+	.include "data/maps/SecretBase_YellowCave4/header.inc"
+	.include "data/maps/SecretBase_Tree4/header.inc"
+	.include "data/maps/SecretBase_Shrub4/header.inc"
+	.include "data/maps/SingleBattleColosseum/header.inc"
+	.include "data/maps/TradeCenter/header.inc"
+	.include "data/maps/RecordCorner/header.inc"
+	.include "data/maps/DoubleBattleColosseum/header.inc"
+	.include "data/maps/LinkContestRoom1/header.inc"
+	.include "data/maps/UnknownMap_25_29/header.inc"
+	.include "data/maps/UnknownMap_25_30/header.inc"
+	.include "data/maps/UnknownMap_25_31/header.inc"
+	.include "data/maps/UnknownMap_25_32/header.inc"
+	.include "data/maps/UnknownMap_25_33/header.inc"
+	.include "data/maps/UnknownMap_25_34/header.inc"
+	.include "data/maps/LinkContestRoom2/header.inc"
+	.include "data/maps/LinkContestRoom3/header.inc"
+	.include "data/maps/LinkContestRoom4/header.inc"
+	.include "data/maps/LinkContestRoom5/header.inc"
+	.include "data/maps/LinkContestRoom6/header.inc"
+	.include "data/maps/InsideOfTruck/header.inc"
+	.include "data/maps/SSTidalCorridor/header.inc"
+	.include "data/maps/SSTidalLowerDeck/header.inc"
+	.include "data/maps/SSTidalRooms/header.inc"
+	.include "data/maps/SafariZone_Northwest/header.inc"
+	.include "data/maps/SafariZone_Northeast/header.inc"
+	.include "data/maps/SafariZone_Southwest/header.inc"
+	.include "data/maps/SafariZone_Southeast/header.inc"
+	.include "data/maps/BattleTower_Outside/header.inc"
+	.include "data/maps/BattleTower_Lobby/header.inc"
+	.include "data/maps/BattleTower_Elevator/header.inc"
+	.include "data/maps/BattleTower_Corridor/header.inc"
+	.include "data/maps/BattleTower_BattleRoom/header.inc"
+	.include "data/maps/SouthernIsland_Exterior/header.inc"
+	.include "data/maps/SouthernIsland_Interior/header.inc"
+	.include "data/maps/SafariZone_RestHouse/header.inc"
+	.include "data/maps/Route104_Prototype/header.inc"
+	.include "data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc"
+	.include "data/maps/Route109_SeashoreHouse/header.inc"
+	.include "data/maps/Route110_TrickHouseEntrance/header.inc"
+	.include "data/maps/Route110_TrickHouseEnd/header.inc"
+	.include "data/maps/Route110_TrickHouseCorridor/header.inc"
+	.include "data/maps/Route110_TrickHousePuzzle1/header.inc"
+	.include "data/maps/Route110_TrickHousePuzzle2/header.inc"
+	.include "data/maps/Route110_TrickHousePuzzle3/header.inc"
+	.include "data/maps/Route110_TrickHousePuzzle4/header.inc"
+	.include "data/maps/Route110_TrickHousePuzzle5/header.inc"
+	.include "data/maps/Route110_TrickHousePuzzle6/header.inc"
+	.include "data/maps/Route110_TrickHousePuzzle7/header.inc"
+	.include "data/maps/Route110_TrickHousePuzzle8/header.inc"
+	.include "data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc"
+	.include "data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc"
+	.include "data/maps/Route113_GlassWorkshop/header.inc"
+	.include "data/maps/Route123_BerryMastersHouse/header.inc"
+	.include "data/maps/Route119_WeatherInstitute_1F/header.inc"
+	.include "data/maps/Route119_WeatherInstitute_2F/header.inc"
+	.include "data/maps/Route119_House/header.inc"
+	.include "data/maps/Route124_DivingTreasureHuntersHouse/header.inc"
diff --git a/data/text/easy_chat/group_orders.inc b/data/text/easy_chat/group_orders.inc
index d08f70a2a..494bf5f7a 100644
--- a/data/text/easy_chat/group_orders.inc
+++ b/data/text/easy_chat/group_orders.inc
@@ -1,25 +1,25 @@
-	.include "data/text/easy_chat/groups/pokemon/order.s"
-	.include "data/text/easy_chat/groups/trainer/order.s"
-	.include "data/text/easy_chat/groups/status/order.s"
-	.include "data/text/easy_chat/groups/battle/order.s"
-	.include "data/text/easy_chat/groups/greetings/order.s"
-	.include "data/text/easy_chat/groups/people/order.s"
-	.include "data/text/easy_chat/groups/voices/order.s"
-	.include "data/text/easy_chat/groups/speech/order.s"
-	.include "data/text/easy_chat/groups/endings/order.s"
-	.include "data/text/easy_chat/groups/feelings/order.s"
-	.include "data/text/easy_chat/groups/conditions/order.s"
-	.include "data/text/easy_chat/groups/actions/order.s"
-	.include "data/text/easy_chat/groups/lifestyle/order.s"
-	.include "data/text/easy_chat/groups/hobbies/order.s"
-	.include "data/text/easy_chat/groups/time/order.s"
-	.include "data/text/easy_chat/groups/misc/order.s"
-	.include "data/text/easy_chat/groups/adjectives/order.s"
-	.include "data/text/easy_chat/groups/events/order.s"
-	.include "data/text/easy_chat/groups/move_1/order.s"
-	.include "data/text/easy_chat/groups/move_2/order.s"
-	.include "data/text/easy_chat/groups/trendy_saying/order.s"
-	.include "data/text/easy_chat/groups/pokemon_2/order.s"
+	.include "data/text/easy_chat/groups/pokemon/order.inc"
+	.include "data/text/easy_chat/groups/trainer/order.inc"
+	.include "data/text/easy_chat/groups/status/order.inc"
+	.include "data/text/easy_chat/groups/battle/order.inc"
+	.include "data/text/easy_chat/groups/greetings/order.inc"
+	.include "data/text/easy_chat/groups/people/order.inc"
+	.include "data/text/easy_chat/groups/voices/order.inc"
+	.include "data/text/easy_chat/groups/speech/order.inc"
+	.include "data/text/easy_chat/groups/endings/order.inc"
+	.include "data/text/easy_chat/groups/feelings/order.inc"
+	.include "data/text/easy_chat/groups/conditions/order.inc"
+	.include "data/text/easy_chat/groups/actions/order.inc"
+	.include "data/text/easy_chat/groups/lifestyle/order.inc"
+	.include "data/text/easy_chat/groups/hobbies/order.inc"
+	.include "data/text/easy_chat/groups/time/order.inc"
+	.include "data/text/easy_chat/groups/misc/order.inc"
+	.include "data/text/easy_chat/groups/adjectives/order.inc"
+	.include "data/text/easy_chat/groups/events/order.inc"
+	.include "data/text/easy_chat/groups/move_1/order.inc"
+	.include "data/text/easy_chat/groups/move_2/order.inc"
+	.include "data/text/easy_chat/groups/trendy_saying/order.inc"
+	.include "data/text/easy_chat/groups/pokemon_2/order.inc"
 
 @ This table is used to find the alphabetical order of each group of words
 @ when listing them. The words must be reordered because they are stored in
diff --git a/data/text/easy_chat/group_words.inc b/data/text/easy_chat/group_words.inc
index b45b767b8..a4ba6bacb 100644
--- a/data/text/easy_chat/group_words.inc
+++ b/data/text/easy_chat/group_words.inc
@@ -1,25 +1,25 @@
-	.include "data/text/easy_chat/groups/pokemon/words.s"
-	.include "data/text/easy_chat/groups/trainer/words.s"
-	.include "data/text/easy_chat/groups/status/words.s"
-	.include "data/text/easy_chat/groups/battle/words.s"
-	.include "data/text/easy_chat/groups/greetings/words.s"
-	.include "data/text/easy_chat/groups/people/words.s"
-	.include "data/text/easy_chat/groups/voices/words.s"
-	.include "data/text/easy_chat/groups/speech/words.s"
-	.include "data/text/easy_chat/groups/endings/words.s"
-	.include "data/text/easy_chat/groups/feelings/words.s"
-	.include "data/text/easy_chat/groups/conditions/words.s"
-	.include "data/text/easy_chat/groups/actions/words.s"
-	.include "data/text/easy_chat/groups/lifestyle/words.s"
-	.include "data/text/easy_chat/groups/hobbies/words.s"
-	.include "data/text/easy_chat/groups/time/words.s"
-	.include "data/text/easy_chat/groups/misc/words.s"
-	.include "data/text/easy_chat/groups/adjectives/words.s"
-	.include "data/text/easy_chat/groups/events/words.s"
-	.include "data/text/easy_chat/groups/move_1/words.s"
-	.include "data/text/easy_chat/groups/move_2/words.s"
-	.include "data/text/easy_chat/groups/trendy_saying/words.s"
-	.include "data/text/easy_chat/groups/pokemon_2/words.s"
+	.include "data/text/easy_chat/groups/pokemon/words.inc"
+	.include "data/text/easy_chat/groups/trainer/words.inc"
+	.include "data/text/easy_chat/groups/status/words.inc"
+	.include "data/text/easy_chat/groups/battle/words.inc"
+	.include "data/text/easy_chat/groups/greetings/words.inc"
+	.include "data/text/easy_chat/groups/people/words.inc"
+	.include "data/text/easy_chat/groups/voices/words.inc"
+	.include "data/text/easy_chat/groups/speech/words.inc"
+	.include "data/text/easy_chat/groups/endings/words.inc"
+	.include "data/text/easy_chat/groups/feelings/words.inc"
+	.include "data/text/easy_chat/groups/conditions/words.inc"
+	.include "data/text/easy_chat/groups/actions/words.inc"
+	.include "data/text/easy_chat/groups/lifestyle/words.inc"
+	.include "data/text/easy_chat/groups/hobbies/words.inc"
+	.include "data/text/easy_chat/groups/time/words.inc"
+	.include "data/text/easy_chat/groups/misc/words.inc"
+	.include "data/text/easy_chat/groups/adjectives/words.inc"
+	.include "data/text/easy_chat/groups/events/words.inc"
+	.include "data/text/easy_chat/groups/move_1/words.inc"
+	.include "data/text/easy_chat/groups/move_2/words.inc"
+	.include "data/text/easy_chat/groups/trendy_saying/words.inc"
+	.include "data/text/easy_chat/groups/pokemon_2/words.inc"
 
 	.align 2
 gEasyChatGroupWords:: @ 83DE0E0
diff --git a/data/text/easy_chat/groups/actions/order.s b/data/text/easy_chat/groups/actions/order.inc
index ffe2ec4e0..ffe2ec4e0 100644
--- a/data/text/easy_chat/groups/actions/order.s
+++ b/data/text/easy_chat/groups/actions/order.inc
diff --git a/data/text/easy_chat/groups/actions/words.s b/data/text/easy_chat/groups/actions/words.inc
index 39f10f896..39f10f896 100644
--- a/data/text/easy_chat/groups/actions/words.s
+++ b/data/text/easy_chat/groups/actions/words.inc
diff --git a/data/text/easy_chat/groups/adjectives/order.s b/data/text/easy_chat/groups/adjectives/order.inc
index 886d6e466..886d6e466 100644
--- a/data/text/easy_chat/groups/adjectives/order.s
+++ b/data/text/easy_chat/groups/adjectives/order.inc
diff --git a/data/text/easy_chat/groups/adjectives/words.s b/data/text/easy_chat/groups/adjectives/words.inc
index ca1762a5b..ca1762a5b 100644
--- a/data/text/easy_chat/groups/adjectives/words.s
+++ b/data/text/easy_chat/groups/adjectives/words.inc
diff --git a/data/text/easy_chat/groups/battle/order.s b/data/text/easy_chat/groups/battle/order.inc
index f47f4b43e..f47f4b43e 100644
--- a/data/text/easy_chat/groups/battle/order.s
+++ b/data/text/easy_chat/groups/battle/order.inc
diff --git a/data/text/easy_chat/groups/battle/words.s b/data/text/easy_chat/groups/battle/words.inc
index cdea8c7b8..cdea8c7b8 100644
--- a/data/text/easy_chat/groups/battle/words.s
+++ b/data/text/easy_chat/groups/battle/words.inc
diff --git a/data/text/easy_chat/groups/conditions/order.s b/data/text/easy_chat/groups/conditions/order.inc
index 6705f9ff6..6705f9ff6 100644
--- a/data/text/easy_chat/groups/conditions/order.s
+++ b/data/text/easy_chat/groups/conditions/order.inc
diff --git a/data/text/easy_chat/groups/conditions/words.s b/data/text/easy_chat/groups/conditions/words.inc
index fd9b9a29d..fd9b9a29d 100644
--- a/data/text/easy_chat/groups/conditions/words.s
+++ b/data/text/easy_chat/groups/conditions/words.inc
diff --git a/data/text/easy_chat/groups/endings/order.s b/data/text/easy_chat/groups/endings/order.inc
index 403a02523..403a02523 100644
--- a/data/text/easy_chat/groups/endings/order.s
+++ b/data/text/easy_chat/groups/endings/order.inc
diff --git a/data/text/easy_chat/groups/endings/words.s b/data/text/easy_chat/groups/endings/words.inc
index e7ca49996..e7ca49996 100644
--- a/data/text/easy_chat/groups/endings/words.s
+++ b/data/text/easy_chat/groups/endings/words.inc
diff --git a/data/text/easy_chat/groups/events/order.s b/data/text/easy_chat/groups/events/order.inc
index 0b48d0f0b..0b48d0f0b 100644
--- a/data/text/easy_chat/groups/events/order.s
+++ b/data/text/easy_chat/groups/events/order.inc
diff --git a/data/text/easy_chat/groups/events/words.s b/data/text/easy_chat/groups/events/words.inc
index 6bfe9c296..6bfe9c296 100644
--- a/data/text/easy_chat/groups/events/words.s
+++ b/data/text/easy_chat/groups/events/words.inc
diff --git a/data/text/easy_chat/groups/feelings/order.s b/data/text/easy_chat/groups/feelings/order.inc
index 0570ae7dc..0570ae7dc 100644
--- a/data/text/easy_chat/groups/feelings/order.s
+++ b/data/text/easy_chat/groups/feelings/order.inc
diff --git a/data/text/easy_chat/groups/feelings/words.s b/data/text/easy_chat/groups/feelings/words.inc
index 510d285c2..510d285c2 100644
--- a/data/text/easy_chat/groups/feelings/words.s
+++ b/data/text/easy_chat/groups/feelings/words.inc
diff --git a/data/text/easy_chat/groups/greetings/order.s b/data/text/easy_chat/groups/greetings/order.inc
index 8310ebd07..8310ebd07 100644
--- a/data/text/easy_chat/groups/greetings/order.s
+++ b/data/text/easy_chat/groups/greetings/order.inc
diff --git a/data/text/easy_chat/groups/greetings/words.s b/data/text/easy_chat/groups/greetings/words.inc
index b283168ca..b283168ca 100644
--- a/data/text/easy_chat/groups/greetings/words.s
+++ b/data/text/easy_chat/groups/greetings/words.inc
diff --git a/data/text/easy_chat/groups/hobbies/order.s b/data/text/easy_chat/groups/hobbies/order.inc
index 41ced1099..41ced1099 100644
--- a/data/text/easy_chat/groups/hobbies/order.s
+++ b/data/text/easy_chat/groups/hobbies/order.inc
diff --git a/data/text/easy_chat/groups/hobbies/words.s b/data/text/easy_chat/groups/hobbies/words.inc
index 3aa4f2887..3aa4f2887 100644
--- a/data/text/easy_chat/groups/hobbies/words.s
+++ b/data/text/easy_chat/groups/hobbies/words.inc
diff --git a/data/text/easy_chat/groups/lifestyle/order.s b/data/text/easy_chat/groups/lifestyle/order.inc
index c0aff2d7b..c0aff2d7b 100644
--- a/data/text/easy_chat/groups/lifestyle/order.s
+++ b/data/text/easy_chat/groups/lifestyle/order.inc
diff --git a/data/text/easy_chat/groups/lifestyle/words.s b/data/text/easy_chat/groups/lifestyle/words.inc
index 64cc1cd86..64cc1cd86 100644
--- a/data/text/easy_chat/groups/lifestyle/words.s
+++ b/data/text/easy_chat/groups/lifestyle/words.inc
diff --git a/data/text/easy_chat/groups/misc/order.s b/data/text/easy_chat/groups/misc/order.inc
index 95184c8fb..95184c8fb 100644
--- a/data/text/easy_chat/groups/misc/order.s
+++ b/data/text/easy_chat/groups/misc/order.inc
diff --git a/data/text/easy_chat/groups/misc/words.s b/data/text/easy_chat/groups/misc/words.inc
index 9e52baf07..9e52baf07 100644
--- a/data/text/easy_chat/groups/misc/words.s
+++ b/data/text/easy_chat/groups/misc/words.inc
diff --git a/data/text/easy_chat/groups/move_1/order.s b/data/text/easy_chat/groups/move_1/order.inc
index 08a250dab..08a250dab 100644
--- a/data/text/easy_chat/groups/move_1/order.s
+++ b/data/text/easy_chat/groups/move_1/order.inc
diff --git a/data/text/easy_chat/groups/move_1/words.s b/data/text/easy_chat/groups/move_1/words.inc
index 52261e34a..52261e34a 100644
--- a/data/text/easy_chat/groups/move_1/words.s
+++ b/data/text/easy_chat/groups/move_1/words.inc
diff --git a/data/text/easy_chat/groups/move_2/order.s b/data/text/easy_chat/groups/move_2/order.inc
index 114d799b1..114d799b1 100644
--- a/data/text/easy_chat/groups/move_2/order.s
+++ b/data/text/easy_chat/groups/move_2/order.inc
diff --git a/data/text/easy_chat/groups/move_2/words.s b/data/text/easy_chat/groups/move_2/words.inc
index cd31397d0..cd31397d0 100644
--- a/data/text/easy_chat/groups/move_2/words.s
+++ b/data/text/easy_chat/groups/move_2/words.inc
diff --git a/data/text/easy_chat/groups/people/order.s b/data/text/easy_chat/groups/people/order.inc
index 6144d7ba3..6144d7ba3 100644
--- a/data/text/easy_chat/groups/people/order.s
+++ b/data/text/easy_chat/groups/people/order.inc
diff --git a/data/text/easy_chat/groups/people/words.s b/data/text/easy_chat/groups/people/words.inc
index 89f370251..89f370251 100644
--- a/data/text/easy_chat/groups/people/words.s
+++ b/data/text/easy_chat/groups/people/words.inc
diff --git a/data/text/easy_chat/groups/pokemon/order.s b/data/text/easy_chat/groups/pokemon/order.inc
index b39d5bd28..b39d5bd28 100644
--- a/data/text/easy_chat/groups/pokemon/order.s
+++ b/data/text/easy_chat/groups/pokemon/order.inc
diff --git a/data/text/easy_chat/groups/pokemon/words.s b/data/text/easy_chat/groups/pokemon/words.inc
index a157e2364..a157e2364 100644
--- a/data/text/easy_chat/groups/pokemon/words.s
+++ b/data/text/easy_chat/groups/pokemon/words.inc
diff --git a/data/text/easy_chat/groups/pokemon_2/order.s b/data/text/easy_chat/groups/pokemon_2/order.inc
index 219e7dfb0..219e7dfb0 100644
--- a/data/text/easy_chat/groups/pokemon_2/order.s
+++ b/data/text/easy_chat/groups/pokemon_2/order.inc
diff --git a/data/text/easy_chat/groups/pokemon_2/words.s b/data/text/easy_chat/groups/pokemon_2/words.inc
index 621ef6635..621ef6635 100644
--- a/data/text/easy_chat/groups/pokemon_2/words.s
+++ b/data/text/easy_chat/groups/pokemon_2/words.inc
diff --git a/data/text/easy_chat/groups/speech/order.s b/data/text/easy_chat/groups/speech/order.inc
index c2cd47835..c2cd47835 100644
--- a/data/text/easy_chat/groups/speech/order.s
+++ b/data/text/easy_chat/groups/speech/order.inc
diff --git a/data/text/easy_chat/groups/speech/words.s b/data/text/easy_chat/groups/speech/words.inc
index becfd03d0..becfd03d0 100644
--- a/data/text/easy_chat/groups/speech/words.s
+++ b/data/text/easy_chat/groups/speech/words.inc
diff --git a/data/text/easy_chat/groups/status/order.s b/data/text/easy_chat/groups/status/order.inc
index 1f1c32fd5..1f1c32fd5 100644
--- a/data/text/easy_chat/groups/status/order.s
+++ b/data/text/easy_chat/groups/status/order.inc
diff --git a/data/text/easy_chat/groups/status/words.s b/data/text/easy_chat/groups/status/words.inc
index 28109b361..28109b361 100644
--- a/data/text/easy_chat/groups/status/words.s
+++ b/data/text/easy_chat/groups/status/words.inc
diff --git a/data/text/easy_chat/groups/time/order.s b/data/text/easy_chat/groups/time/order.inc
index c8be7bc3b..c8be7bc3b 100644
--- a/data/text/easy_chat/groups/time/order.s
+++ b/data/text/easy_chat/groups/time/order.inc
diff --git a/data/text/easy_chat/groups/time/words.s b/data/text/easy_chat/groups/time/words.inc
index 4048d3714..4048d3714 100644
--- a/data/text/easy_chat/groups/time/words.s
+++ b/data/text/easy_chat/groups/time/words.inc
diff --git a/data/text/easy_chat/groups/trainer/order.s b/data/text/easy_chat/groups/trainer/order.inc
index 4238e578a..4238e578a 100644
--- a/data/text/easy_chat/groups/trainer/order.s
+++ b/data/text/easy_chat/groups/trainer/order.inc
diff --git a/data/text/easy_chat/groups/trainer/words.s b/data/text/easy_chat/groups/trainer/words.inc
index 8a1a40c76..8a1a40c76 100644
--- a/data/text/easy_chat/groups/trainer/words.s
+++ b/data/text/easy_chat/groups/trainer/words.inc
diff --git a/data/text/easy_chat/groups/trendy_saying/order.s b/data/text/easy_chat/groups/trendy_saying/order.inc
index 5b4cd031a..5b4cd031a 100644
--- a/data/text/easy_chat/groups/trendy_saying/order.s
+++ b/data/text/easy_chat/groups/trendy_saying/order.inc
diff --git a/data/text/easy_chat/groups/trendy_saying/words.s b/data/text/easy_chat/groups/trendy_saying/words.inc
index d69a5213c..d69a5213c 100644
--- a/data/text/easy_chat/groups/trendy_saying/words.s
+++ b/data/text/easy_chat/groups/trendy_saying/words.inc
diff --git a/data/text/easy_chat/groups/voices/order.s b/data/text/easy_chat/groups/voices/order.inc
index 563abcb09..563abcb09 100644
--- a/data/text/easy_chat/groups/voices/order.s
+++ b/data/text/easy_chat/groups/voices/order.inc
diff --git a/data/text/easy_chat/groups/voices/words.s b/data/text/easy_chat/groups/voices/words.inc
index 1dde075b9..1dde075b9 100644
--- a/data/text/easy_chat/groups/voices/words.s
+++ b/data/text/easy_chat/groups/voices/words.inc
diff --git a/data/text/gabby_and_ty.s b/data/text/gabby_and_ty.inc
index d0eb413be..d0eb413be 100644
--- a/data/text/gabby_and_ty.s
+++ b/data/text/gabby_and_ty.inc
diff --git a/data/text/pokemon_news.s b/data/text/pokemon_news.inc
index 95bb0888a..95bb0888a 100644
--- a/data/text/pokemon_news.s
+++ b/data/text/pokemon_news.inc
diff --git a/data/text/tv.inc b/data/text/tv.inc
index f1f078405..c27559abd 100644
--- a/data/text/tv.inc
+++ b/data/text/tv.inc
@@ -1046,5 +1046,5 @@ gTVWorldOfMastersText3:: @ 81ABDF2
 	.string "That’s all for today.\n"
 	.string "Please tune in next time.$"
 
-	.include "data/text/gabby_and_ty.s"
-	.include "data/text/pokemon_news.s"
+	.include "data/text/gabby_and_ty.inc"
+	.include "data/text/pokemon_news.inc"