included .s to .inc

394 files changed, 0 insertions, 0 deletions

diff --git a/data/scripts/maps/AbandonedShip_CaptainsOffice.s b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc
index cf525003e..cf525003e 100644
--- a/data/scripts/maps/AbandonedShip_CaptainsOffice.s
+++ b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc
diff --git a/data/scripts/maps/AbandonedShip_Corridors_1F.s b/data/scripts/maps/AbandonedShip_Corridors_1F.inc
index 0c7278f3b..0c7278f3b 100644
--- a/data/scripts/maps/AbandonedShip_Corridors_1F.s
+++ b/data/scripts/maps/AbandonedShip_Corridors_1F.inc
diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.s b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc
index e6b6a8f3d..e6b6a8f3d 100644
--- a/data/scripts/maps/AbandonedShip_Corridors_B1F.s
+++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc
diff --git a/data/scripts/maps/AbandonedShip_Deck.s b/data/scripts/maps/AbandonedShip_Deck.inc
index 49f837744..49f837744 100644
--- a/data/scripts/maps/AbandonedShip_Deck.s
+++ b/data/scripts/maps/AbandonedShip_Deck.inc
diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.s b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc
index 4b634106a..4b634106a 100644
--- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.s
+++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc
diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.s b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc
index 5e90673fe..5e90673fe 100644
--- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.s
+++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc
diff --git a/data/scripts/maps/AbandonedShip_Room_B1F.s b/data/scripts/maps/AbandonedShip_Room_B1F.inc
index 4cdc8bbd1..4cdc8bbd1 100644
--- a/data/scripts/maps/AbandonedShip_Room_B1F.s
+++ b/data/scripts/maps/AbandonedShip_Room_B1F.inc
diff --git a/data/scripts/maps/AbandonedShip_Rooms2_1F.s b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc
index b2525d62e..b2525d62e 100644
--- a/data/scripts/maps/AbandonedShip_Rooms2_1F.s
+++ b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc
diff --git a/data/scripts/maps/AbandonedShip_Rooms2_B1F.s b/data/scripts/maps/AbandonedShip_Rooms2_B1F.inc
index 0c8f3ffc9..0c8f3ffc9 100644
--- a/data/scripts/maps/AbandonedShip_Rooms2_B1F.s
+++ b/data/scripts/maps/AbandonedShip_Rooms2_B1F.inc
diff --git a/data/scripts/maps/AbandonedShip_Rooms_1F.s b/data/scripts/maps/AbandonedShip_Rooms_1F.inc
index c5f9ad3f5..c5f9ad3f5 100644
--- a/data/scripts/maps/AbandonedShip_Rooms_1F.s
+++ b/data/scripts/maps/AbandonedShip_Rooms_1F.inc
diff --git a/data/scripts/maps/AbandonedShip_Rooms_B1F.s b/data/scripts/maps/AbandonedShip_Rooms_B1F.inc
index 44b8c5f20..44b8c5f20 100644
--- a/data/scripts/maps/AbandonedShip_Rooms_B1F.s
+++ b/data/scripts/maps/AbandonedShip_Rooms_B1F.inc
diff --git a/data/scripts/maps/AbandonedShip_Underwater1.s b/data/scripts/maps/AbandonedShip_Underwater1.inc
index 71d903682..71d903682 100644
--- a/data/scripts/maps/AbandonedShip_Underwater1.s
+++ b/data/scripts/maps/AbandonedShip_Underwater1.inc
diff --git a/data/scripts/maps/AbandonedShip_Underwater2.s b/data/scripts/maps/AbandonedShip_Underwater2.inc
index f7b434c07..f7b434c07 100644
--- a/data/scripts/maps/AbandonedShip_Underwater2.s
+++ b/data/scripts/maps/AbandonedShip_Underwater2.inc
diff --git a/data/scripts/maps/AncientTomb.s b/data/scripts/maps/AncientTomb.inc
index f8eba6a9d..f8eba6a9d 100644
--- a/data/scripts/maps/AncientTomb.s
+++ b/data/scripts/maps/AncientTomb.inc
diff --git a/data/scripts/maps/AquaHideout_1F.s b/data/scripts/maps/AquaHideout_1F.inc
index cc1ad33b1..cc1ad33b1 100644
--- a/data/scripts/maps/AquaHideout_1F.s
+++ b/data/scripts/maps/AquaHideout_1F.inc
diff --git a/data/scripts/maps/AquaHideout_B1F.s b/data/scripts/maps/AquaHideout_B1F.inc
index 969d590e3..969d590e3 100644
--- a/data/scripts/maps/AquaHideout_B1F.s
+++ b/data/scripts/maps/AquaHideout_B1F.inc
diff --git a/data/scripts/maps/AquaHideout_B2F.s b/data/scripts/maps/AquaHideout_B2F.inc
index 845b755b7..845b755b7 100644
--- a/data/scripts/maps/AquaHideout_B2F.s
+++ b/data/scripts/maps/AquaHideout_B2F.inc
diff --git a/data/scripts/maps/BattleTower_BattleRoom.s b/data/scripts/maps/BattleTower_BattleRoom.inc
index d991b8853..d991b8853 100644
--- a/data/scripts/maps/BattleTower_BattleRoom.s
+++ b/data/scripts/maps/BattleTower_BattleRoom.inc
diff --git a/data/scripts/maps/BattleTower_Corridor.s b/data/scripts/maps/BattleTower_Corridor.inc
index 4ccf2028c..4ccf2028c 100644
--- a/data/scripts/maps/BattleTower_Corridor.s
+++ b/data/scripts/maps/BattleTower_Corridor.inc
diff --git a/data/scripts/maps/BattleTower_Elevator.s b/data/scripts/maps/BattleTower_Elevator.inc
index 7a79cc4e9..7a79cc4e9 100644
--- a/data/scripts/maps/BattleTower_Elevator.s
+++ b/data/scripts/maps/BattleTower_Elevator.inc
diff --git a/data/scripts/maps/BattleTower_Lobby.s b/data/scripts/maps/BattleTower_Lobby.inc
index cee3d7cec..cee3d7cec 100644
--- a/data/scripts/maps/BattleTower_Lobby.s
+++ b/data/scripts/maps/BattleTower_Lobby.inc
diff --git a/data/scripts/maps/BattleTower_Outside.s b/data/scripts/maps/BattleTower_Outside.inc
index 02c4e0c6f..02c4e0c6f 100644
--- a/data/scripts/maps/BattleTower_Outside.s
+++ b/data/scripts/maps/BattleTower_Outside.inc
diff --git a/data/scripts/maps/CaveOfOrigin_1F.s b/data/scripts/maps/CaveOfOrigin_1F.inc
index 7fd365b36..7fd365b36 100644
--- a/data/scripts/maps/CaveOfOrigin_1F.s
+++ b/data/scripts/maps/CaveOfOrigin_1F.inc
diff --git a/data/scripts/maps/CaveOfOrigin_B1F.s b/data/scripts/maps/CaveOfOrigin_B1F.inc
index 9603ae83b..9603ae83b 100644
--- a/data/scripts/maps/CaveOfOrigin_B1F.s
+++ b/data/scripts/maps/CaveOfOrigin_B1F.inc
diff --git a/data/scripts/maps/CaveOfOrigin_B2F.s b/data/scripts/maps/CaveOfOrigin_B2F.inc
index 6b3a55648..6b3a55648 100644
--- a/data/scripts/maps/CaveOfOrigin_B2F.s
+++ b/data/scripts/maps/CaveOfOrigin_B2F.inc
diff --git a/data/scripts/maps/CaveOfOrigin_B3F.s b/data/scripts/maps/CaveOfOrigin_B3F.inc
index 8e61048d2..8e61048d2 100644
--- a/data/scripts/maps/CaveOfOrigin_B3F.s
+++ b/data/scripts/maps/CaveOfOrigin_B3F.inc
diff --git a/data/scripts/maps/CaveOfOrigin_B4F.s b/data/scripts/maps/CaveOfOrigin_B4F.inc
index e9f23ff5a..e9f23ff5a 100644
--- a/data/scripts/maps/CaveOfOrigin_B4F.s
+++ b/data/scripts/maps/CaveOfOrigin_B4F.inc
diff --git a/data/scripts/maps/CaveOfOrigin_Entrance.s b/data/scripts/maps/CaveOfOrigin_Entrance.inc
index 68f91e0bd..68f91e0bd 100644
--- a/data/scripts/maps/CaveOfOrigin_Entrance.s
+++ b/data/scripts/maps/CaveOfOrigin_Entrance.inc
diff --git a/data/scripts/maps/DesertRuins.s b/data/scripts/maps/DesertRuins.inc
index d5787d792..d5787d792 100644
--- a/data/scripts/maps/DesertRuins.s
+++ b/data/scripts/maps/DesertRuins.inc
diff --git a/data/scripts/maps/DewfordTown.s b/data/scripts/maps/DewfordTown.inc
index 8ca2eb3df..8ca2eb3df 100644
--- a/data/scripts/maps/DewfordTown.s
+++ b/data/scripts/maps/DewfordTown.inc
diff --git a/data/scripts/maps/DewfordTown_Gym.s b/data/scripts/maps/DewfordTown_Gym.inc
index 51d4f44ba..51d4f44ba 100644
--- a/data/scripts/maps/DewfordTown_Gym.s
+++ b/data/scripts/maps/DewfordTown_Gym.inc
diff --git a/data/scripts/maps/DewfordTown_Hall.s b/data/scripts/maps/DewfordTown_Hall.inc
index 0b25e0aba..0b25e0aba 100644
--- a/data/scripts/maps/DewfordTown_Hall.s
+++ b/data/scripts/maps/DewfordTown_Hall.inc
diff --git a/data/scripts/maps/DewfordTown_House1.s b/data/scripts/maps/DewfordTown_House1.inc
index 40e06357c..40e06357c 100644
--- a/data/scripts/maps/DewfordTown_House1.s
+++ b/data/scripts/maps/DewfordTown_House1.inc
diff --git a/data/scripts/maps/DewfordTown_House2.s b/data/scripts/maps/DewfordTown_House2.inc
index 529f8bb24..529f8bb24 100644
--- a/data/scripts/maps/DewfordTown_House2.s
+++ b/data/scripts/maps/DewfordTown_House2.inc
diff --git a/data/scripts/maps/DewfordTown_PokemonCenter_1F.s b/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc
index 96c198ae5..96c198ae5 100644
--- a/data/scripts/maps/DewfordTown_PokemonCenter_1F.s
+++ b/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc
diff --git a/data/scripts/maps/DewfordTown_PokemonCenter_2F.s b/data/scripts/maps/DewfordTown_PokemonCenter_2F.inc
index 554c9ef6b..554c9ef6b 100644
--- a/data/scripts/maps/DewfordTown_PokemonCenter_2F.s
+++ b/data/scripts/maps/DewfordTown_PokemonCenter_2F.inc
diff --git a/data/scripts/maps/DoubleBattleColosseum.s b/data/scripts/maps/DoubleBattleColosseum.inc
index 9bc33e6bd..9bc33e6bd 100644
--- a/data/scripts/maps/DoubleBattleColosseum.s
+++ b/data/scripts/maps/DoubleBattleColosseum.inc
diff --git a/data/scripts/maps/EverGrandeCity.s b/data/scripts/maps/EverGrandeCity.inc
index 9b6d2a8b7..9b6d2a8b7 100644
--- a/data/scripts/maps/EverGrandeCity.s
+++ b/data/scripts/maps/EverGrandeCity.inc
diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.s b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc
index 0e5dc21b0..0e5dc21b0 100644
--- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.s
+++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc
diff --git a/data/scripts/maps/EverGrandeCity_Corridor1.s b/data/scripts/maps/EverGrandeCity_Corridor1.inc
index 499ad673f..499ad673f 100644
--- a/data/scripts/maps/EverGrandeCity_Corridor1.s
+++ b/data/scripts/maps/EverGrandeCity_Corridor1.inc
diff --git a/data/scripts/maps/EverGrandeCity_Corridor2.s b/data/scripts/maps/EverGrandeCity_Corridor2.inc
index 692de1ed9..692de1ed9 100644
--- a/data/scripts/maps/EverGrandeCity_Corridor2.s
+++ b/data/scripts/maps/EverGrandeCity_Corridor2.inc
diff --git a/data/scripts/maps/EverGrandeCity_Corridor3.s b/data/scripts/maps/EverGrandeCity_Corridor3.inc
index f8ed19669..f8ed19669 100644
--- a/data/scripts/maps/EverGrandeCity_Corridor3.s
+++ b/data/scripts/maps/EverGrandeCity_Corridor3.inc
diff --git a/data/scripts/maps/EverGrandeCity_Corridor4.s b/data/scripts/maps/EverGrandeCity_Corridor4.inc
index 616a25ec5..616a25ec5 100644
--- a/data/scripts/maps/EverGrandeCity_Corridor4.s
+++ b/data/scripts/maps/EverGrandeCity_Corridor4.inc
diff --git a/data/scripts/maps/EverGrandeCity_Corridor5.s b/data/scripts/maps/EverGrandeCity_Corridor5.inc
index 783b03aec..783b03aec 100644
--- a/data/scripts/maps/EverGrandeCity_Corridor5.s
+++ b/data/scripts/maps/EverGrandeCity_Corridor5.inc
diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.s b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc
index c16bd544f..c16bd544f 100644
--- a/data/scripts/maps/EverGrandeCity_DrakesRoom.s
+++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc
diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.s b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc
index 039b2a772..039b2a772 100644
--- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.s
+++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc
diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.s b/data/scripts/maps/EverGrandeCity_HallOfFame.inc
index 2e7099110..2e7099110 100644
--- a/data/scripts/maps/EverGrandeCity_HallOfFame.s
+++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc
diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.s b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc
index 7e8ee131a..7e8ee131a 100644
--- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.s
+++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc
diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.s b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc
index 7c0b8b0a4..7c0b8b0a4 100644
--- a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.s
+++ b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc
diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_2F.s b/data/scripts/maps/EverGrandeCity_PokemonCenter_2F.inc
index 9941e17e4..9941e17e4 100644
--- a/data/scripts/maps/EverGrandeCity_PokemonCenter_2F.s
+++ b/data/scripts/maps/EverGrandeCity_PokemonCenter_2F.inc
diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.s b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc
index bfb3cdc1b..bfb3cdc1b 100644
--- a/data/scripts/maps/EverGrandeCity_PokemonLeague.s
+++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc
diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.s b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc
index 84a6c3fdc..84a6c3fdc 100644
--- a/data/scripts/maps/EverGrandeCity_SidneysRoom.s
+++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc
diff --git a/data/scripts/maps/FallarborTown.s b/data/scripts/maps/FallarborTown.inc
index a48be5b24..a48be5b24 100644
--- a/data/scripts/maps/FallarborTown.s
+++ b/data/scripts/maps/FallarborTown.inc
diff --git a/data/scripts/maps/FallarborTown_ContestHall.s b/data/scripts/maps/FallarborTown_ContestHall.inc
index e3fcfd9bc..e3fcfd9bc 100644
--- a/data/scripts/maps/FallarborTown_ContestHall.s
+++ b/data/scripts/maps/FallarborTown_ContestHall.inc
diff --git a/data/scripts/maps/FallarborTown_ContestLobby.s b/data/scripts/maps/FallarborTown_ContestLobby.inc
index 9bbd48722..9bbd48722 100644
--- a/data/scripts/maps/FallarborTown_ContestLobby.s
+++ b/data/scripts/maps/FallarborTown_ContestLobby.inc
diff --git a/data/scripts/maps/FallarborTown_House1.s b/data/scripts/maps/FallarborTown_House1.inc
index 8a44cdcfb..8a44cdcfb 100644
--- a/data/scripts/maps/FallarborTown_House1.s
+++ b/data/scripts/maps/FallarborTown_House1.inc
diff --git a/data/scripts/maps/FallarborTown_House2.s b/data/scripts/maps/FallarborTown_House2.inc
index 179f281af..179f281af 100644
--- a/data/scripts/maps/FallarborTown_House2.s
+++ b/data/scripts/maps/FallarborTown_House2.inc
diff --git a/data/scripts/maps/FallarborTown_Mart.s b/data/scripts/maps/FallarborTown_Mart.inc
index 4b66546e8..4b66546e8 100644
--- a/data/scripts/maps/FallarborTown_Mart.s
+++ b/data/scripts/maps/FallarborTown_Mart.inc
diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.s b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc
index 636cac8f1..636cac8f1 100644
--- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.s
+++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc
diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_2F.s b/data/scripts/maps/FallarborTown_PokemonCenter_2F.inc
index 148b22531..148b22531 100644
--- a/data/scripts/maps/FallarborTown_PokemonCenter_2F.s
+++ b/data/scripts/maps/FallarborTown_PokemonCenter_2F.inc
diff --git a/data/scripts/maps/FieryPath.s b/data/scripts/maps/FieryPath.inc
index bd984ad20..bd984ad20 100644
--- a/data/scripts/maps/FieryPath.s
+++ b/data/scripts/maps/FieryPath.inc
diff --git a/data/scripts/maps/FortreeCity.s b/data/scripts/maps/FortreeCity.inc
index 7f9d5ae12..7f9d5ae12 100644
--- a/data/scripts/maps/FortreeCity.s
+++ b/data/scripts/maps/FortreeCity.inc
diff --git a/data/scripts/maps/FortreeCity_DecorationShop.s b/data/scripts/maps/FortreeCity_DecorationShop.inc
index c9d9fdd4e..c9d9fdd4e 100644
--- a/data/scripts/maps/FortreeCity_DecorationShop.s
+++ b/data/scripts/maps/FortreeCity_DecorationShop.inc
diff --git a/data/scripts/maps/FortreeCity_Gym.s b/data/scripts/maps/FortreeCity_Gym.inc
index 1bf6b0825..1bf6b0825 100644
--- a/data/scripts/maps/FortreeCity_Gym.s
+++ b/data/scripts/maps/FortreeCity_Gym.inc
diff --git a/data/scripts/maps/FortreeCity_House1.s b/data/scripts/maps/FortreeCity_House1.inc
index 0ae6e3fbd..0ae6e3fbd 100644
--- a/data/scripts/maps/FortreeCity_House1.s
+++ b/data/scripts/maps/FortreeCity_House1.inc
diff --git a/data/scripts/maps/FortreeCity_House2.s b/data/scripts/maps/FortreeCity_House2.inc
index ea4aad3d8..ea4aad3d8 100644
--- a/data/scripts/maps/FortreeCity_House2.s
+++ b/data/scripts/maps/FortreeCity_House2.inc
diff --git a/data/scripts/maps/FortreeCity_House3.s b/data/scripts/maps/FortreeCity_House3.inc
index f5d11ffa7..f5d11ffa7 100644
--- a/data/scripts/maps/FortreeCity_House3.s
+++ b/data/scripts/maps/FortreeCity_House3.inc
diff --git a/data/scripts/maps/FortreeCity_House4.s b/data/scripts/maps/FortreeCity_House4.inc
index 33d0ed1ae..33d0ed1ae 100644
--- a/data/scripts/maps/FortreeCity_House4.s
+++ b/data/scripts/maps/FortreeCity_House4.inc
diff --git a/data/scripts/maps/FortreeCity_House5.s b/data/scripts/maps/FortreeCity_House5.inc
index 1144a8e81..1144a8e81 100644
--- a/data/scripts/maps/FortreeCity_House5.s
+++ b/data/scripts/maps/FortreeCity_House5.inc
diff --git a/data/scripts/maps/FortreeCity_Mart.s b/data/scripts/maps/FortreeCity_Mart.inc
index 9e5f34ff9..9e5f34ff9 100644
--- a/data/scripts/maps/FortreeCity_Mart.s
+++ b/data/scripts/maps/FortreeCity_Mart.inc
diff --git a/data/scripts/maps/FortreeCity_PokemonCenter_1F.s b/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc
index 148324abf..148324abf 100644
--- a/data/scripts/maps/FortreeCity_PokemonCenter_1F.s
+++ b/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc
diff --git a/data/scripts/maps/FortreeCity_PokemonCenter_2F.s b/data/scripts/maps/FortreeCity_PokemonCenter_2F.inc
index 3019dbbc0..3019dbbc0 100644
--- a/data/scripts/maps/FortreeCity_PokemonCenter_2F.s
+++ b/data/scripts/maps/FortreeCity_PokemonCenter_2F.inc
diff --git a/data/scripts/maps/GraniteCave_1F.s b/data/scripts/maps/GraniteCave_1F.inc
index 59aaa2fc3..59aaa2fc3 100644
--- a/data/scripts/maps/GraniteCave_1F.s
+++ b/data/scripts/maps/GraniteCave_1F.inc
diff --git a/data/scripts/maps/GraniteCave_B1F.s b/data/scripts/maps/GraniteCave_B1F.inc
index 240de1d98..240de1d98 100644
--- a/data/scripts/maps/GraniteCave_B1F.s
+++ b/data/scripts/maps/GraniteCave_B1F.inc
diff --git a/data/scripts/maps/GraniteCave_B2F.s b/data/scripts/maps/GraniteCave_B2F.inc
index 54e1150f1..54e1150f1 100644
--- a/data/scripts/maps/GraniteCave_B2F.s
+++ b/data/scripts/maps/GraniteCave_B2F.inc
diff --git a/data/scripts/maps/GraniteCave_StevensRoom.s b/data/scripts/maps/GraniteCave_StevensRoom.inc
index 895241406..895241406 100644
--- a/data/scripts/maps/GraniteCave_StevensRoom.s
+++ b/data/scripts/maps/GraniteCave_StevensRoom.inc
diff --git a/data/scripts/maps/InsideOfTruck.s b/data/scripts/maps/InsideOfTruck.inc
index 0c26f0f88..0c26f0f88 100644
--- a/data/scripts/maps/InsideOfTruck.s
+++ b/data/scripts/maps/InsideOfTruck.inc
diff --git a/data/scripts/maps/IslandCave.s b/data/scripts/maps/IslandCave.inc
index b52b13b5a..b52b13b5a 100644
--- a/data/scripts/maps/IslandCave.s
+++ b/data/scripts/maps/IslandCave.inc
diff --git a/data/scripts/maps/JaggedPass.s b/data/scripts/maps/JaggedPass.inc
index 3ae0882c5..3ae0882c5 100644
--- a/data/scripts/maps/JaggedPass.s
+++ b/data/scripts/maps/JaggedPass.inc
diff --git a/data/scripts/maps/LavaridgeTown.s b/data/scripts/maps/LavaridgeTown.inc
index a71bd4854..a71bd4854 100644
--- a/data/scripts/maps/LavaridgeTown.s
+++ b/data/scripts/maps/LavaridgeTown.inc
diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.s b/data/scripts/maps/LavaridgeTown_Gym_1F.inc
index 57506bdb6..57506bdb6 100644
--- a/data/scripts/maps/LavaridgeTown_Gym_1F.s
+++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc
diff --git a/data/scripts/maps/LavaridgeTown_Gym_B1F.s b/data/scripts/maps/LavaridgeTown_Gym_B1F.inc
index 58178722c..58178722c 100644
--- a/data/scripts/maps/LavaridgeTown_Gym_B1F.s
+++ b/data/scripts/maps/LavaridgeTown_Gym_B1F.inc
diff --git a/data/scripts/maps/LavaridgeTown_HerbShop.s b/data/scripts/maps/LavaridgeTown_HerbShop.inc
index 6ff103ce3..6ff103ce3 100644
--- a/data/scripts/maps/LavaridgeTown_HerbShop.s
+++ b/data/scripts/maps/LavaridgeTown_HerbShop.inc
diff --git a/data/scripts/maps/LavaridgeTown_House.s b/data/scripts/maps/LavaridgeTown_House.inc
index 944427bb6..944427bb6 100644
--- a/data/scripts/maps/LavaridgeTown_House.s
+++ b/data/scripts/maps/LavaridgeTown_House.inc
diff --git a/data/scripts/maps/LavaridgeTown_Mart.s b/data/scripts/maps/LavaridgeTown_Mart.inc
index 4f28e16b0..4f28e16b0 100644
--- a/data/scripts/maps/LavaridgeTown_Mart.s
+++ b/data/scripts/maps/LavaridgeTown_Mart.inc
diff --git a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.s b/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc
index c0762bcc3..c0762bcc3 100644
--- a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.s
+++ b/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc
diff --git a/data/scripts/maps/LavaridgeTown_PokemonCenter_2F.s b/data/scripts/maps/LavaridgeTown_PokemonCenter_2F.inc
index daaeb0b93..daaeb0b93 100644
--- a/data/scripts/maps/LavaridgeTown_PokemonCenter_2F.s
+++ b/data/scripts/maps/LavaridgeTown_PokemonCenter_2F.inc
diff --git a/data/scripts/maps/LilycoveCity.s b/data/scripts/maps/LilycoveCity.inc
index ae36e33b5..ae36e33b5 100644
--- a/data/scripts/maps/LilycoveCity.s
+++ b/data/scripts/maps/LilycoveCity.inc
diff --git a/data/scripts/maps/LilycoveCity_ContestHall.s b/data/scripts/maps/LilycoveCity_ContestHall.inc
index 3601cb455..3601cb455 100644
--- a/data/scripts/maps/LilycoveCity_ContestHall.s
+++ b/data/scripts/maps/LilycoveCity_ContestHall.inc
diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.s b/data/scripts/maps/LilycoveCity_ContestLobby.inc
index ed12473b9..ed12473b9 100644
--- a/data/scripts/maps/LilycoveCity_ContestLobby.s
+++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc
diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.s b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc
index 95945a595..95945a595 100644
--- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.s
+++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc
diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.s b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
index d2a86e0a5..d2a86e0a5 100644
--- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.s
+++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.s b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc
index c82cc6428..c82cc6428 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.s
+++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.s b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc
index f84c84201..f84c84201 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.s
+++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.s b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc
index 325c56330..325c56330 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.s
+++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_2F.s b/data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc
index e54883714..e54883714 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_2F.s
+++ b/data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_3F.s b/data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc
index e669cef7f..e669cef7f 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_3F.s
+++ b/data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_4F.s b/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc
index 994b3b63f..994b3b63f 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_4F.s
+++ b/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.s b/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc
index 0bef8866a..0bef8866a 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.s
+++ b/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc
diff --git a/data/scripts/maps/LilycoveCity_EmptyMap.s b/data/scripts/maps/LilycoveCity_EmptyMap.inc
index 16d025174..16d025174 100644
--- a/data/scripts/maps/LilycoveCity_EmptyMap.s
+++ b/data/scripts/maps/LilycoveCity_EmptyMap.inc
diff --git a/data/scripts/maps/LilycoveCity_Harbor.s b/data/scripts/maps/LilycoveCity_Harbor.inc
index 2f4e4352e..2f4e4352e 100644
--- a/data/scripts/maps/LilycoveCity_Harbor.s
+++ b/data/scripts/maps/LilycoveCity_Harbor.inc
diff --git a/data/scripts/maps/LilycoveCity_House1.s b/data/scripts/maps/LilycoveCity_House1.inc
index 3dae362c1..3dae362c1 100644
--- a/data/scripts/maps/LilycoveCity_House1.s
+++ b/data/scripts/maps/LilycoveCity_House1.inc
diff --git a/data/scripts/maps/LilycoveCity_House2.s b/data/scripts/maps/LilycoveCity_House2.inc
index 75780667d..75780667d 100644
--- a/data/scripts/maps/LilycoveCity_House2.s
+++ b/data/scripts/maps/LilycoveCity_House2.inc
diff --git a/data/scripts/maps/LilycoveCity_House3.s b/data/scripts/maps/LilycoveCity_House3.inc
index 51e4988b3..51e4988b3 100644
--- a/data/scripts/maps/LilycoveCity_House3.s
+++ b/data/scripts/maps/LilycoveCity_House3.inc
diff --git a/data/scripts/maps/LilycoveCity_House4.s b/data/scripts/maps/LilycoveCity_House4.inc
index 13bc95dfa..13bc95dfa 100644
--- a/data/scripts/maps/LilycoveCity_House4.s
+++ b/data/scripts/maps/LilycoveCity_House4.inc
diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.s b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc
index a481f9c32..a481f9c32 100644
--- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.s
+++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc
diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.s b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc
index 2e6d6698f..2e6d6698f 100644
--- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.s
+++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc
diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.s b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc
index c9b026060..c9b026060 100644
--- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.s
+++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc
diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.s b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc
index 5809e28c8..5809e28c8 100644
--- a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.s
+++ b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc
diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_2F.s b/data/scripts/maps/LilycoveCity_PokemonCenter_2F.inc
index e4554e49c..e4554e49c 100644
--- a/data/scripts/maps/LilycoveCity_PokemonCenter_2F.s
+++ b/data/scripts/maps/LilycoveCity_PokemonCenter_2F.inc
diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.s b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc
index 9ac66f98e..9ac66f98e 100644
--- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.s
+++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc
diff --git a/data/scripts/maps/LilycoveCity_UnusedMart.s b/data/scripts/maps/LilycoveCity_UnusedMart.inc
index 2e7ff450f..2e7ff450f 100644
--- a/data/scripts/maps/LilycoveCity_UnusedMart.s
+++ b/data/scripts/maps/LilycoveCity_UnusedMart.inc
diff --git a/data/scripts/maps/LinkContestRoom1.s b/data/scripts/maps/LinkContestRoom1.inc
index 2709f558c..2709f558c 100644
--- a/data/scripts/maps/LinkContestRoom1.s
+++ b/data/scripts/maps/LinkContestRoom1.inc
diff --git a/data/scripts/maps/LinkContestRoom2.s b/data/scripts/maps/LinkContestRoom2.inc
index f61e3fae6..f61e3fae6 100644
--- a/data/scripts/maps/LinkContestRoom2.s
+++ b/data/scripts/maps/LinkContestRoom2.inc
diff --git a/data/scripts/maps/LinkContestRoom3.s b/data/scripts/maps/LinkContestRoom3.inc
index 5a34f848a..5a34f848a 100644
--- a/data/scripts/maps/LinkContestRoom3.s
+++ b/data/scripts/maps/LinkContestRoom3.inc
diff --git a/data/scripts/maps/LinkContestRoom4.s b/data/scripts/maps/LinkContestRoom4.inc
index bf6539bdd..bf6539bdd 100644
--- a/data/scripts/maps/LinkContestRoom4.s
+++ b/data/scripts/maps/LinkContestRoom4.inc
diff --git a/data/scripts/maps/LinkContestRoom5.s b/data/scripts/maps/LinkContestRoom5.inc
index d3cd5d64b..d3cd5d64b 100644
--- a/data/scripts/maps/LinkContestRoom5.s
+++ b/data/scripts/maps/LinkContestRoom5.inc
diff --git a/data/scripts/maps/LinkContestRoom6.s b/data/scripts/maps/LinkContestRoom6.inc
index 26296ece6..26296ece6 100644
--- a/data/scripts/maps/LinkContestRoom6.s
+++ b/data/scripts/maps/LinkContestRoom6.inc
diff --git a/data/scripts/maps/LittlerootTown.s b/data/scripts/maps/LittlerootTown.inc
index 81692acc5..81692acc5 100644
--- a/data/scripts/maps/LittlerootTown.s
+++ b/data/scripts/maps/LittlerootTown.inc
diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.s b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc
index 9816734d0..9816734d0 100644
--- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.s
+++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc
diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.s b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc
index 4f121118a..4f121118a 100644
--- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.s
+++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc
diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.s b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
index 2b9ad42ef..2b9ad42ef 100644
--- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.s
+++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.s b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
index 7871940ca..7871940ca 100644
--- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.s
+++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.s b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc
index 94aeadfa6..94aeadfa6 100644
--- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.s
+++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc
diff --git a/data/scripts/maps/MagmaHideout_1F.s b/data/scripts/maps/MagmaHideout_1F.inc
index f5b535f71..f5b535f71 100644
--- a/data/scripts/maps/MagmaHideout_1F.s
+++ b/data/scripts/maps/MagmaHideout_1F.inc
diff --git a/data/scripts/maps/MagmaHideout_B1F.s b/data/scripts/maps/MagmaHideout_B1F.inc
index 0304181fb..0304181fb 100644
--- a/data/scripts/maps/MagmaHideout_B1F.s
+++ b/data/scripts/maps/MagmaHideout_B1F.inc
diff --git a/data/scripts/maps/MagmaHideout_B2F.s b/data/scripts/maps/MagmaHideout_B2F.inc
index 222297ef7..222297ef7 100644
--- a/data/scripts/maps/MagmaHideout_B2F.s
+++ b/data/scripts/maps/MagmaHideout_B2F.inc
diff --git a/data/scripts/maps/MauvilleCity.s b/data/scripts/maps/MauvilleCity.inc
index 1b2827f2a..1b2827f2a 100644
--- a/data/scripts/maps/MauvilleCity.s
+++ b/data/scripts/maps/MauvilleCity.inc
diff --git a/data/scripts/maps/MauvilleCity_BikeShop.s b/data/scripts/maps/MauvilleCity_BikeShop.inc
index cb3b8505b..cb3b8505b 100644
--- a/data/scripts/maps/MauvilleCity_BikeShop.s
+++ b/data/scripts/maps/MauvilleCity_BikeShop.inc
diff --git a/data/scripts/maps/MauvilleCity_GameCorner.s b/data/scripts/maps/MauvilleCity_GameCorner.inc
index a0aab4238..a0aab4238 100644
--- a/data/scripts/maps/MauvilleCity_GameCorner.s
+++ b/data/scripts/maps/MauvilleCity_GameCorner.inc
diff --git a/data/scripts/maps/MauvilleCity_Gym.s b/data/scripts/maps/MauvilleCity_Gym.inc
index 9abac00d7..9abac00d7 100644
--- a/data/scripts/maps/MauvilleCity_Gym.s
+++ b/data/scripts/maps/MauvilleCity_Gym.inc
diff --git a/data/scripts/maps/MauvilleCity_House1.s b/data/scripts/maps/MauvilleCity_House1.inc
index 48ee31be5..48ee31be5 100644
--- a/data/scripts/maps/MauvilleCity_House1.s
+++ b/data/scripts/maps/MauvilleCity_House1.inc
diff --git a/data/scripts/maps/MauvilleCity_House2.s b/data/scripts/maps/MauvilleCity_House2.inc
index 8a73af034..8a73af034 100644
--- a/data/scripts/maps/MauvilleCity_House2.s
+++ b/data/scripts/maps/MauvilleCity_House2.inc
diff --git a/data/scripts/maps/MauvilleCity_Mart.s b/data/scripts/maps/MauvilleCity_Mart.inc
index fac5906ad..fac5906ad 100644
--- a/data/scripts/maps/MauvilleCity_Mart.s
+++ b/data/scripts/maps/MauvilleCity_Mart.inc
diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.s b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc
index b943b9c8f..b943b9c8f 100644
--- a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.s
+++ b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc
diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_2F.s b/data/scripts/maps/MauvilleCity_PokemonCenter_2F.inc
index e85e80308..e85e80308 100644
--- a/data/scripts/maps/MauvilleCity_PokemonCenter_2F.s
+++ b/data/scripts/maps/MauvilleCity_PokemonCenter_2F.inc
diff --git a/data/scripts/maps/MeteorFalls_1F_1R.s b/data/scripts/maps/MeteorFalls_1F_1R.inc
index 3e7155955..3e7155955 100644
--- a/data/scripts/maps/MeteorFalls_1F_1R.s
+++ b/data/scripts/maps/MeteorFalls_1F_1R.inc
diff --git a/data/scripts/maps/MeteorFalls_1F_2R.s b/data/scripts/maps/MeteorFalls_1F_2R.inc
index 6c239043d..6c239043d 100644
--- a/data/scripts/maps/MeteorFalls_1F_2R.s
+++ b/data/scripts/maps/MeteorFalls_1F_2R.inc
diff --git a/data/scripts/maps/MeteorFalls_B1F_1R.s b/data/scripts/maps/MeteorFalls_B1F_1R.inc
index 57d458b23..57d458b23 100644
--- a/data/scripts/maps/MeteorFalls_B1F_1R.s
+++ b/data/scripts/maps/MeteorFalls_B1F_1R.inc
diff --git a/data/scripts/maps/MeteorFalls_B1F_2R.s b/data/scripts/maps/MeteorFalls_B1F_2R.inc
index 514e60966..514e60966 100644
--- a/data/scripts/maps/MeteorFalls_B1F_2R.s
+++ b/data/scripts/maps/MeteorFalls_B1F_2R.inc
diff --git a/data/scripts/maps/MossdeepCity.s b/data/scripts/maps/MossdeepCity.inc
index ddb317364..ddb317364 100644
--- a/data/scripts/maps/MossdeepCity.s
+++ b/data/scripts/maps/MossdeepCity.inc
diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.s b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
index c56adb1f3..c56adb1f3 100644
--- a/data/scripts/maps/MossdeepCity_GameCorner_1F.s
+++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.s b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
index a733093f9..a733093f9 100644
--- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.s
+++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
diff --git a/data/scripts/maps/MossdeepCity_Gym.s b/data/scripts/maps/MossdeepCity_Gym.inc
index 192f9e396..192f9e396 100644
--- a/data/scripts/maps/MossdeepCity_Gym.s
+++ b/data/scripts/maps/MossdeepCity_Gym.inc
diff --git a/data/scripts/maps/MossdeepCity_House1.s b/data/scripts/maps/MossdeepCity_House1.inc
index d83e49643..d83e49643 100644
--- a/data/scripts/maps/MossdeepCity_House1.s
+++ b/data/scripts/maps/MossdeepCity_House1.inc
diff --git a/data/scripts/maps/MossdeepCity_House2.s b/data/scripts/maps/MossdeepCity_House2.inc
index f3d07b64e..f3d07b64e 100644
--- a/data/scripts/maps/MossdeepCity_House2.s
+++ b/data/scripts/maps/MossdeepCity_House2.inc
diff --git a/data/scripts/maps/MossdeepCity_House3.s b/data/scripts/maps/MossdeepCity_House3.inc
index fd97ee598..fd97ee598 100644
--- a/data/scripts/maps/MossdeepCity_House3.s
+++ b/data/scripts/maps/MossdeepCity_House3.inc
diff --git a/data/scripts/maps/MossdeepCity_House4.s b/data/scripts/maps/MossdeepCity_House4.inc
index bc8f44400..bc8f44400 100644
--- a/data/scripts/maps/MossdeepCity_House4.s
+++ b/data/scripts/maps/MossdeepCity_House4.inc
diff --git a/data/scripts/maps/MossdeepCity_Mart.s b/data/scripts/maps/MossdeepCity_Mart.inc
index d1e861b99..d1e861b99 100644
--- a/data/scripts/maps/MossdeepCity_Mart.s
+++ b/data/scripts/maps/MossdeepCity_Mart.inc
diff --git a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.s b/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc
index 988608ffd..988608ffd 100644
--- a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.s
+++ b/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc
diff --git a/data/scripts/maps/MossdeepCity_PokemonCenter_2F.s b/data/scripts/maps/MossdeepCity_PokemonCenter_2F.inc
index a88147c08..a88147c08 100644
--- a/data/scripts/maps/MossdeepCity_PokemonCenter_2F.s
+++ b/data/scripts/maps/MossdeepCity_PokemonCenter_2F.inc
diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.s b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc
index 3b3a7f083..3b3a7f083 100644
--- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.s
+++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc
diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.s b/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc
index 97467f4e5..97467f4e5 100644
--- a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.s
+++ b/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc
diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.s b/data/scripts/maps/MossdeepCity_StevensHouse.inc
index d4477bd39..d4477bd39 100644
--- a/data/scripts/maps/MossdeepCity_StevensHouse.s
+++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc
diff --git a/data/scripts/maps/MtChimney.s b/data/scripts/maps/MtChimney.inc
index b7a43328b..b7a43328b 100644
--- a/data/scripts/maps/MtChimney.s
+++ b/data/scripts/maps/MtChimney.inc
diff --git a/data/scripts/maps/MtChimney_CableCarStation.s b/data/scripts/maps/MtChimney_CableCarStation.inc
index c00914f2e..c00914f2e 100644
--- a/data/scripts/maps/MtChimney_CableCarStation.s
+++ b/data/scripts/maps/MtChimney_CableCarStation.inc
diff --git a/data/scripts/maps/MtPyre_1F.s b/data/scripts/maps/MtPyre_1F.inc
index 805c4a8d3..805c4a8d3 100644
--- a/data/scripts/maps/MtPyre_1F.s
+++ b/data/scripts/maps/MtPyre_1F.inc
diff --git a/data/scripts/maps/MtPyre_2F.s b/data/scripts/maps/MtPyre_2F.inc
index c44251af7..c44251af7 100644
--- a/data/scripts/maps/MtPyre_2F.s
+++ b/data/scripts/maps/MtPyre_2F.inc
diff --git a/data/scripts/maps/MtPyre_3F.s b/data/scripts/maps/MtPyre_3F.inc
index ea8bda7b5..ea8bda7b5 100644
--- a/data/scripts/maps/MtPyre_3F.s
+++ b/data/scripts/maps/MtPyre_3F.inc
diff --git a/data/scripts/maps/MtPyre_4F.s b/data/scripts/maps/MtPyre_4F.inc
index e1ebac7c1..e1ebac7c1 100644
--- a/data/scripts/maps/MtPyre_4F.s
+++ b/data/scripts/maps/MtPyre_4F.inc
diff --git a/data/scripts/maps/MtPyre_5F.s b/data/scripts/maps/MtPyre_5F.inc
index 9adb249f0..9adb249f0 100644
--- a/data/scripts/maps/MtPyre_5F.s
+++ b/data/scripts/maps/MtPyre_5F.inc
diff --git a/data/scripts/maps/MtPyre_6F.s b/data/scripts/maps/MtPyre_6F.inc
index 3729079bb..3729079bb 100644
--- a/data/scripts/maps/MtPyre_6F.s
+++ b/data/scripts/maps/MtPyre_6F.inc
diff --git a/data/scripts/maps/MtPyre_Exterior.s b/data/scripts/maps/MtPyre_Exterior.inc
index efffc7c3b..efffc7c3b 100644
--- a/data/scripts/maps/MtPyre_Exterior.s
+++ b/data/scripts/maps/MtPyre_Exterior.inc
diff --git a/data/scripts/maps/MtPyre_Summit.s b/data/scripts/maps/MtPyre_Summit.inc
index e352ac30e..e352ac30e 100644
--- a/data/scripts/maps/MtPyre_Summit.s
+++ b/data/scripts/maps/MtPyre_Summit.inc
diff --git a/data/scripts/maps/NewMauville_Entrance.s b/data/scripts/maps/NewMauville_Entrance.inc
index dc5885939..dc5885939 100644
--- a/data/scripts/maps/NewMauville_Entrance.s
+++ b/data/scripts/maps/NewMauville_Entrance.inc
diff --git a/data/scripts/maps/NewMauville_Inside.s b/data/scripts/maps/NewMauville_Inside.inc
index 29c42e460..29c42e460 100644
--- a/data/scripts/maps/NewMauville_Inside.s
+++ b/data/scripts/maps/NewMauville_Inside.inc
diff --git a/data/scripts/maps/OldaleTown.s b/data/scripts/maps/OldaleTown.inc
index 68ed80949..68ed80949 100644
--- a/data/scripts/maps/OldaleTown.s
+++ b/data/scripts/maps/OldaleTown.inc
diff --git a/data/scripts/maps/OldaleTown_House1.s b/data/scripts/maps/OldaleTown_House1.inc
index 1e519a737..1e519a737 100644
--- a/data/scripts/maps/OldaleTown_House1.s
+++ b/data/scripts/maps/OldaleTown_House1.inc
diff --git a/data/scripts/maps/OldaleTown_House2.s b/data/scripts/maps/OldaleTown_House2.inc
index 57a9ab8ac..57a9ab8ac 100644
--- a/data/scripts/maps/OldaleTown_House2.s
+++ b/data/scripts/maps/OldaleTown_House2.inc
diff --git a/data/scripts/maps/OldaleTown_Mart.s b/data/scripts/maps/OldaleTown_Mart.inc
index 3f4994890..3f4994890 100644
--- a/data/scripts/maps/OldaleTown_Mart.s
+++ b/data/scripts/maps/OldaleTown_Mart.inc
diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.s b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc
index 4ba96ddc8..4ba96ddc8 100644
--- a/data/scripts/maps/OldaleTown_PokemonCenter_1F.s
+++ b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc
diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_2F.s b/data/scripts/maps/OldaleTown_PokemonCenter_2F.inc
index 622f50c29..622f50c29 100644
--- a/data/scripts/maps/OldaleTown_PokemonCenter_2F.s
+++ b/data/scripts/maps/OldaleTown_PokemonCenter_2F.inc
diff --git a/data/scripts/maps/PacifidlogTown.s b/data/scripts/maps/PacifidlogTown.inc
index c7cfb08df..c7cfb08df 100644
--- a/data/scripts/maps/PacifidlogTown.s
+++ b/data/scripts/maps/PacifidlogTown.inc
diff --git a/data/scripts/maps/PacifidlogTown_House1.s b/data/scripts/maps/PacifidlogTown_House1.inc
index 4b3586a16..4b3586a16 100644
--- a/data/scripts/maps/PacifidlogTown_House1.s
+++ b/data/scripts/maps/PacifidlogTown_House1.inc
diff --git a/data/scripts/maps/PacifidlogTown_House2.s b/data/scripts/maps/PacifidlogTown_House2.inc
index b95a41ceb..b95a41ceb 100644
--- a/data/scripts/maps/PacifidlogTown_House2.s
+++ b/data/scripts/maps/PacifidlogTown_House2.inc
diff --git a/data/scripts/maps/PacifidlogTown_House3.s b/data/scripts/maps/PacifidlogTown_House3.inc
index 7ee815f07..7ee815f07 100644
--- a/data/scripts/maps/PacifidlogTown_House3.s
+++ b/data/scripts/maps/PacifidlogTown_House3.inc
diff --git a/data/scripts/maps/PacifidlogTown_House4.s b/data/scripts/maps/PacifidlogTown_House4.inc
index e48644beb..e48644beb 100644
--- a/data/scripts/maps/PacifidlogTown_House4.s
+++ b/data/scripts/maps/PacifidlogTown_House4.inc
diff --git a/data/scripts/maps/PacifidlogTown_House5.s b/data/scripts/maps/PacifidlogTown_House5.inc
index f20de28df..f20de28df 100644
--- a/data/scripts/maps/PacifidlogTown_House5.s
+++ b/data/scripts/maps/PacifidlogTown_House5.inc
diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.s b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc
index 973f80a55..973f80a55 100644
--- a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.s
+++ b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc
diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_2F.s b/data/scripts/maps/PacifidlogTown_PokemonCenter_2F.inc
index 2bff37736..2bff37736 100644
--- a/data/scripts/maps/PacifidlogTown_PokemonCenter_2F.s
+++ b/data/scripts/maps/PacifidlogTown_PokemonCenter_2F.inc
diff --git a/data/scripts/maps/PetalburgCity.s b/data/scripts/maps/PetalburgCity.inc
index 3667eb3cf..3667eb3cf 100644
--- a/data/scripts/maps/PetalburgCity.s
+++ b/data/scripts/maps/PetalburgCity.inc
diff --git a/data/scripts/maps/PetalburgCity_Gym.s b/data/scripts/maps/PetalburgCity_Gym.inc
index 9c6802e28..9c6802e28 100644
--- a/data/scripts/maps/PetalburgCity_Gym.s
+++ b/data/scripts/maps/PetalburgCity_Gym.inc
diff --git a/data/scripts/maps/PetalburgCity_House1.s b/data/scripts/maps/PetalburgCity_House1.inc
index 7a3b7c1b1..7a3b7c1b1 100644
--- a/data/scripts/maps/PetalburgCity_House1.s
+++ b/data/scripts/maps/PetalburgCity_House1.inc
diff --git a/data/scripts/maps/PetalburgCity_House2.s b/data/scripts/maps/PetalburgCity_House2.inc
index 4cc1325a2..4cc1325a2 100644
--- a/data/scripts/maps/PetalburgCity_House2.s
+++ b/data/scripts/maps/PetalburgCity_House2.inc
diff --git a/data/scripts/maps/PetalburgCity_Mart.s b/data/scripts/maps/PetalburgCity_Mart.inc
index 2eac03cac..2eac03cac 100644
--- a/data/scripts/maps/PetalburgCity_Mart.s
+++ b/data/scripts/maps/PetalburgCity_Mart.inc
diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.s b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc
index 09d414dcb..09d414dcb 100644
--- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.s
+++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc
diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_2F.s b/data/scripts/maps/PetalburgCity_PokemonCenter_2F.inc
index a95823736..a95823736 100644
--- a/data/scripts/maps/PetalburgCity_PokemonCenter_2F.s
+++ b/data/scripts/maps/PetalburgCity_PokemonCenter_2F.inc
diff --git a/data/scripts/maps/PetalburgCity_WallysHouse.s b/data/scripts/maps/PetalburgCity_WallysHouse.inc
index e8ac407dc..e8ac407dc 100644
--- a/data/scripts/maps/PetalburgCity_WallysHouse.s
+++ b/data/scripts/maps/PetalburgCity_WallysHouse.inc
diff --git a/data/scripts/maps/PetalburgWoods.s b/data/scripts/maps/PetalburgWoods.inc
index 8d6946bcd..8d6946bcd 100644
--- a/data/scripts/maps/PetalburgWoods.s
+++ b/data/scripts/maps/PetalburgWoods.inc
diff --git a/data/scripts/maps/RecordCorner.s b/data/scripts/maps/RecordCorner.inc
index 8a2c1db22..8a2c1db22 100644
--- a/data/scripts/maps/RecordCorner.s
+++ b/data/scripts/maps/RecordCorner.inc
diff --git a/data/scripts/maps/Route101.s b/data/scripts/maps/Route101.inc
index 944473e96..944473e96 100644
--- a/data/scripts/maps/Route101.s
+++ b/data/scripts/maps/Route101.inc
diff --git a/data/scripts/maps/Route102.s b/data/scripts/maps/Route102.inc
index 70d25eace..70d25eace 100644
--- a/data/scripts/maps/Route102.s
+++ b/data/scripts/maps/Route102.inc
diff --git a/data/scripts/maps/Route103.s b/data/scripts/maps/Route103.inc
index f47f5a824..f47f5a824 100644
--- a/data/scripts/maps/Route103.s
+++ b/data/scripts/maps/Route103.inc
diff --git a/data/scripts/maps/Route104.s b/data/scripts/maps/Route104.inc
index bb98b023d..bb98b023d 100644
--- a/data/scripts/maps/Route104.s
+++ b/data/scripts/maps/Route104.inc
diff --git a/data/scripts/maps/Route104_MrBrineysHouse.s b/data/scripts/maps/Route104_MrBrineysHouse.inc
index 5c6704e67..5c6704e67 100644
--- a/data/scripts/maps/Route104_MrBrineysHouse.s
+++ b/data/scripts/maps/Route104_MrBrineysHouse.inc
diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.s b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc
index 02842c62d..02842c62d 100644
--- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.s
+++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc
diff --git a/data/scripts/maps/Route104_Prototype.s b/data/scripts/maps/Route104_Prototype.inc
index 184127187..184127187 100644
--- a/data/scripts/maps/Route104_Prototype.s
+++ b/data/scripts/maps/Route104_Prototype.inc
diff --git a/data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.s b/data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.inc
index f979ab60b..f979ab60b 100644
--- a/data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.s
+++ b/data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.inc
diff --git a/data/scripts/maps/Route105.s b/data/scripts/maps/Route105.inc
index c71e2ce05..c71e2ce05 100644
--- a/data/scripts/maps/Route105.s
+++ b/data/scripts/maps/Route105.inc
diff --git a/data/scripts/maps/Route106.s b/data/scripts/maps/Route106.inc
index 1889eb4d7..1889eb4d7 100644
--- a/data/scripts/maps/Route106.s
+++ b/data/scripts/maps/Route106.inc
diff --git a/data/scripts/maps/Route107.s b/data/scripts/maps/Route107.inc
index ef3407265..ef3407265 100644
--- a/data/scripts/maps/Route107.s
+++ b/data/scripts/maps/Route107.inc
diff --git a/data/scripts/maps/Route108.s b/data/scripts/maps/Route108.inc
index 2e40c882d..2e40c882d 100644
--- a/data/scripts/maps/Route108.s
+++ b/data/scripts/maps/Route108.inc
diff --git a/data/scripts/maps/Route109.s b/data/scripts/maps/Route109.inc
index 343a8cab9..343a8cab9 100644
--- a/data/scripts/maps/Route109.s
+++ b/data/scripts/maps/Route109.inc
diff --git a/data/scripts/maps/Route109_SeashoreHouse.s b/data/scripts/maps/Route109_SeashoreHouse.inc
index e1d9c380b..e1d9c380b 100644
--- a/data/scripts/maps/Route109_SeashoreHouse.s
+++ b/data/scripts/maps/Route109_SeashoreHouse.inc
diff --git a/data/scripts/maps/Route110.s b/data/scripts/maps/Route110.inc
index 55c8f67df..55c8f67df 100644
--- a/data/scripts/maps/Route110.s
+++ b/data/scripts/maps/Route110.inc
diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.s b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc
index 0dbd5dfc4..0dbd5dfc4 100644
--- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.s
+++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc
diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.s b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc
index 96fb13f2b..96fb13f2b 100644
--- a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.s
+++ b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc
diff --git a/data/scripts/maps/Route110_TrickHouseCorridor.s b/data/scripts/maps/Route110_TrickHouseCorridor.inc
index 7b3d93118..7b3d93118 100644
--- a/data/scripts/maps/Route110_TrickHouseCorridor.s
+++ b/data/scripts/maps/Route110_TrickHouseCorridor.inc
diff --git a/data/scripts/maps/Route110_TrickHouseEnd.s b/data/scripts/maps/Route110_TrickHouseEnd.inc
index d2b2eaefb..d2b2eaefb 100644
--- a/data/scripts/maps/Route110_TrickHouseEnd.s
+++ b/data/scripts/maps/Route110_TrickHouseEnd.inc
diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.s b/data/scripts/maps/Route110_TrickHouseEntrance.inc
index 434794b2f..434794b2f 100644
--- a/data/scripts/maps/Route110_TrickHouseEntrance.s
+++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle1.s b/data/scripts/maps/Route110_TrickHousePuzzle1.inc
index 6b6d45af2..6b6d45af2 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle1.s
+++ b/data/scripts/maps/Route110_TrickHousePuzzle1.inc
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.s b/data/scripts/maps/Route110_TrickHousePuzzle2.inc
index 183431bfc..183431bfc 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle2.s
+++ b/data/scripts/maps/Route110_TrickHousePuzzle2.inc
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.s b/data/scripts/maps/Route110_TrickHousePuzzle3.inc
index b533dbbe5..b533dbbe5 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle3.s
+++ b/data/scripts/maps/Route110_TrickHousePuzzle3.inc
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle4.s b/data/scripts/maps/Route110_TrickHousePuzzle4.inc
index 89d5e45c3..89d5e45c3 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle4.s
+++ b/data/scripts/maps/Route110_TrickHousePuzzle4.inc
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.s b/data/scripts/maps/Route110_TrickHousePuzzle5.inc
index cd5d2fbb9..cd5d2fbb9 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle5.s
+++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.s b/data/scripts/maps/Route110_TrickHousePuzzle6.inc
index 56d350871..56d350871 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle6.s
+++ b/data/scripts/maps/Route110_TrickHousePuzzle6.inc
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.s b/data/scripts/maps/Route110_TrickHousePuzzle7.inc
index 1276562d0..1276562d0 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle7.s
+++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle8.s b/data/scripts/maps/Route110_TrickHousePuzzle8.inc
index a31c868be..a31c868be 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle8.s
+++ b/data/scripts/maps/Route110_TrickHousePuzzle8.inc
diff --git a/data/scripts/maps/Route111.s b/data/scripts/maps/Route111.inc
index 10b34cf5f..10b34cf5f 100644
--- a/data/scripts/maps/Route111.s
+++ b/data/scripts/maps/Route111.inc
diff --git a/data/scripts/maps/Route111_OldLadysRestStop.s b/data/scripts/maps/Route111_OldLadysRestStop.inc
index 107026a4b..107026a4b 100644
--- a/data/scripts/maps/Route111_OldLadysRestStop.s
+++ b/data/scripts/maps/Route111_OldLadysRestStop.inc
diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.s b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc
index 3eb514ad2..3eb514ad2 100644
--- a/data/scripts/maps/Route111_WinstrateFamilysHouse.s
+++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc
diff --git a/data/scripts/maps/Route112.s b/data/scripts/maps/Route112.inc
index c2ad14a02..c2ad14a02 100644
--- a/data/scripts/maps/Route112.s
+++ b/data/scripts/maps/Route112.inc
diff --git a/data/scripts/maps/Route112_CableCarStation.s b/data/scripts/maps/Route112_CableCarStation.inc
index 3e5f75929..3e5f75929 100644
--- a/data/scripts/maps/Route112_CableCarStation.s
+++ b/data/scripts/maps/Route112_CableCarStation.inc
diff --git a/data/scripts/maps/Route113.s b/data/scripts/maps/Route113.inc
index c07f537d1..c07f537d1 100644
--- a/data/scripts/maps/Route113.s
+++ b/data/scripts/maps/Route113.inc
diff --git a/data/scripts/maps/Route113_GlassWorkshop.s b/data/scripts/maps/Route113_GlassWorkshop.inc
index d59942472..d59942472 100644
--- a/data/scripts/maps/Route113_GlassWorkshop.s
+++ b/data/scripts/maps/Route113_GlassWorkshop.inc
diff --git a/data/scripts/maps/Route114.s b/data/scripts/maps/Route114.inc
index 33e89be70..33e89be70 100644
--- a/data/scripts/maps/Route114.s
+++ b/data/scripts/maps/Route114.inc
diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.s b/data/scripts/maps/Route114_FossilManiacsHouse.inc
index 50305dc04..50305dc04 100644
--- a/data/scripts/maps/Route114_FossilManiacsHouse.s
+++ b/data/scripts/maps/Route114_FossilManiacsHouse.inc
diff --git a/data/scripts/maps/Route114_FossilManiacsTunnel.s b/data/scripts/maps/Route114_FossilManiacsTunnel.inc
index 7986a0436..7986a0436 100644
--- a/data/scripts/maps/Route114_FossilManiacsTunnel.s
+++ b/data/scripts/maps/Route114_FossilManiacsTunnel.inc
diff --git a/data/scripts/maps/Route114_LanettesHouse.s b/data/scripts/maps/Route114_LanettesHouse.inc
index ff8a1c565..ff8a1c565 100644
--- a/data/scripts/maps/Route114_LanettesHouse.s
+++ b/data/scripts/maps/Route114_LanettesHouse.inc
diff --git a/data/scripts/maps/Route115.s b/data/scripts/maps/Route115.inc
index e2c00f6fc..e2c00f6fc 100644
--- a/data/scripts/maps/Route115.s
+++ b/data/scripts/maps/Route115.inc
diff --git a/data/scripts/maps/Route116.s b/data/scripts/maps/Route116.inc
index c563dce46..c563dce46 100644
--- a/data/scripts/maps/Route116.s
+++ b/data/scripts/maps/Route116.inc
diff --git a/data/scripts/maps/Route116_TunnelersRestHouse.s b/data/scripts/maps/Route116_TunnelersRestHouse.inc
index d141fae37..d141fae37 100644
--- a/data/scripts/maps/Route116_TunnelersRestHouse.s
+++ b/data/scripts/maps/Route116_TunnelersRestHouse.inc
diff --git a/data/scripts/maps/Route117.s b/data/scripts/maps/Route117.inc
index 8c738ffff..8c738ffff 100644
--- a/data/scripts/maps/Route117.s
+++ b/data/scripts/maps/Route117.inc
diff --git a/data/scripts/maps/Route117_PokemonDayCare.s b/data/scripts/maps/Route117_PokemonDayCare.inc
index 2a3ee79e1..2a3ee79e1 100644
--- a/data/scripts/maps/Route117_PokemonDayCare.s
+++ b/data/scripts/maps/Route117_PokemonDayCare.inc
diff --git a/data/scripts/maps/Route118.s b/data/scripts/maps/Route118.inc
index 4d739ce68..4d739ce68 100644
--- a/data/scripts/maps/Route118.s
+++ b/data/scripts/maps/Route118.inc
diff --git a/data/scripts/maps/Route119.s b/data/scripts/maps/Route119.inc
index 1ccc972bb..1ccc972bb 100644
--- a/data/scripts/maps/Route119.s
+++ b/data/scripts/maps/Route119.inc
diff --git a/data/scripts/maps/Route119_House.s b/data/scripts/maps/Route119_House.inc
index 6395e40eb..6395e40eb 100644
--- a/data/scripts/maps/Route119_House.s
+++ b/data/scripts/maps/Route119_House.inc
diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.s b/data/scripts/maps/Route119_WeatherInstitute_1F.inc
index 36314a59f..36314a59f 100644
--- a/data/scripts/maps/Route119_WeatherInstitute_1F.s
+++ b/data/scripts/maps/Route119_WeatherInstitute_1F.inc
diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.s b/data/scripts/maps/Route119_WeatherInstitute_2F.inc
index 37f8e9ec6..37f8e9ec6 100644
--- a/data/scripts/maps/Route119_WeatherInstitute_2F.s
+++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc
diff --git a/data/scripts/maps/Route120.s b/data/scripts/maps/Route120.inc
index ada773ffd..ada773ffd 100644
--- a/data/scripts/maps/Route120.s
+++ b/data/scripts/maps/Route120.inc
diff --git a/data/scripts/maps/Route121.s b/data/scripts/maps/Route121.inc
index 54912b0bc..54912b0bc 100644
--- a/data/scripts/maps/Route121.s
+++ b/data/scripts/maps/Route121.inc
diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.s b/data/scripts/maps/Route121_SafariZoneEntrance.inc
index 2056bc328..2056bc328 100644
--- a/data/scripts/maps/Route121_SafariZoneEntrance.s
+++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc
diff --git a/data/scripts/maps/Route122.s b/data/scripts/maps/Route122.inc
index 4c4e49aa1..4c4e49aa1 100644
--- a/data/scripts/maps/Route122.s
+++ b/data/scripts/maps/Route122.inc
diff --git a/data/scripts/maps/Route123.s b/data/scripts/maps/Route123.inc
index e9248c230..e9248c230 100644
--- a/data/scripts/maps/Route123.s
+++ b/data/scripts/maps/Route123.inc
diff --git a/data/scripts/maps/Route123_BerryMastersHouse.s b/data/scripts/maps/Route123_BerryMastersHouse.inc
index 9290f845d..9290f845d 100644
--- a/data/scripts/maps/Route123_BerryMastersHouse.s
+++ b/data/scripts/maps/Route123_BerryMastersHouse.inc
diff --git a/data/scripts/maps/Route124.s b/data/scripts/maps/Route124.inc
index ea288daa0..ea288daa0 100644
--- a/data/scripts/maps/Route124.s
+++ b/data/scripts/maps/Route124.inc
diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.s b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc
index e1049c8be..e1049c8be 100644
--- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.s
+++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc
diff --git a/data/scripts/maps/Route125.s b/data/scripts/maps/Route125.inc
index 0059fe6aa..0059fe6aa 100644
--- a/data/scripts/maps/Route125.s
+++ b/data/scripts/maps/Route125.inc
diff --git a/data/scripts/maps/Route126.s b/data/scripts/maps/Route126.inc
index f3d1a77f9..f3d1a77f9 100644
--- a/data/scripts/maps/Route126.s
+++ b/data/scripts/maps/Route126.inc
diff --git a/data/scripts/maps/Route127.s b/data/scripts/maps/Route127.inc
index b4461b253..b4461b253 100644
--- a/data/scripts/maps/Route127.s
+++ b/data/scripts/maps/Route127.inc
diff --git a/data/scripts/maps/Route128.s b/data/scripts/maps/Route128.inc
index 28317c4e3..28317c4e3 100644
--- a/data/scripts/maps/Route128.s
+++ b/data/scripts/maps/Route128.inc
diff --git a/data/scripts/maps/Route129.s b/data/scripts/maps/Route129.inc
index ea43c5eab..ea43c5eab 100644
--- a/data/scripts/maps/Route129.s
+++ b/data/scripts/maps/Route129.inc
diff --git a/data/scripts/maps/Route130.s b/data/scripts/maps/Route130.inc
index 38818dba3..38818dba3 100644
--- a/data/scripts/maps/Route130.s
+++ b/data/scripts/maps/Route130.inc
diff --git a/data/scripts/maps/Route131.s b/data/scripts/maps/Route131.inc
index 81cb7dc02..81cb7dc02 100644
--- a/data/scripts/maps/Route131.s
+++ b/data/scripts/maps/Route131.inc
diff --git a/data/scripts/maps/Route132.s b/data/scripts/maps/Route132.inc
index 642330fd4..642330fd4 100644
--- a/data/scripts/maps/Route132.s
+++ b/data/scripts/maps/Route132.inc
diff --git a/data/scripts/maps/Route133.s b/data/scripts/maps/Route133.inc
index 78bec4141..78bec4141 100644
--- a/data/scripts/maps/Route133.s
+++ b/data/scripts/maps/Route133.inc
diff --git a/data/scripts/maps/Route134.s b/data/scripts/maps/Route134.inc
index b1f77fac1..b1f77fac1 100644
--- a/data/scripts/maps/Route134.s
+++ b/data/scripts/maps/Route134.inc
diff --git a/data/scripts/maps/RustboroCity.s b/data/scripts/maps/RustboroCity.inc
index c338e8b67..c338e8b67 100644
--- a/data/scripts/maps/RustboroCity.s
+++ b/data/scripts/maps/RustboroCity.inc
diff --git a/data/scripts/maps/RustboroCity_CuttersHouse.s b/data/scripts/maps/RustboroCity_CuttersHouse.inc
index d400de1ef..d400de1ef 100644
--- a/data/scripts/maps/RustboroCity_CuttersHouse.s
+++ b/data/scripts/maps/RustboroCity_CuttersHouse.inc
diff --git a/data/scripts/maps/RustboroCity_DevonCorp_1F.s b/data/scripts/maps/RustboroCity_DevonCorp_1F.inc
index 97a59257f..97a59257f 100644
--- a/data/scripts/maps/RustboroCity_DevonCorp_1F.s
+++ b/data/scripts/maps/RustboroCity_DevonCorp_1F.inc
diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.s b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc
index e35015b3e..e35015b3e 100644
--- a/data/scripts/maps/RustboroCity_DevonCorp_2F.s
+++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc
diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.s b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
index 2b749c873..2b749c873 100644
--- a/data/scripts/maps/RustboroCity_DevonCorp_3F.s
+++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
diff --git a/data/scripts/maps/RustboroCity_Flat1_1F.s b/data/scripts/maps/RustboroCity_Flat1_1F.inc
index dbbdf22b7..dbbdf22b7 100644
--- a/data/scripts/maps/RustboroCity_Flat1_1F.s
+++ b/data/scripts/maps/RustboroCity_Flat1_1F.inc
diff --git a/data/scripts/maps/RustboroCity_Flat1_2F.s b/data/scripts/maps/RustboroCity_Flat1_2F.inc
index 53672bb42..53672bb42 100644
--- a/data/scripts/maps/RustboroCity_Flat1_2F.s
+++ b/data/scripts/maps/RustboroCity_Flat1_2F.inc
diff --git a/data/scripts/maps/RustboroCity_Flat2_1F.s b/data/scripts/maps/RustboroCity_Flat2_1F.inc
index 5aa91d5d1..5aa91d5d1 100644
--- a/data/scripts/maps/RustboroCity_Flat2_1F.s
+++ b/data/scripts/maps/RustboroCity_Flat2_1F.inc
diff --git a/data/scripts/maps/RustboroCity_Flat2_2F.s b/data/scripts/maps/RustboroCity_Flat2_2F.inc
index d6e0c92b3..d6e0c92b3 100644
--- a/data/scripts/maps/RustboroCity_Flat2_2F.s
+++ b/data/scripts/maps/RustboroCity_Flat2_2F.inc
diff --git a/data/scripts/maps/RustboroCity_Flat2_3F.s b/data/scripts/maps/RustboroCity_Flat2_3F.inc
index d3b05b5bf..d3b05b5bf 100644
--- a/data/scripts/maps/RustboroCity_Flat2_3F.s
+++ b/data/scripts/maps/RustboroCity_Flat2_3F.inc
diff --git a/data/scripts/maps/RustboroCity_Gym.s b/data/scripts/maps/RustboroCity_Gym.inc
index e4f91f82e..e4f91f82e 100644
--- a/data/scripts/maps/RustboroCity_Gym.s
+++ b/data/scripts/maps/RustboroCity_Gym.inc
diff --git a/data/scripts/maps/RustboroCity_House1.s b/data/scripts/maps/RustboroCity_House1.inc
index a10d7b69e..a10d7b69e 100644
--- a/data/scripts/maps/RustboroCity_House1.s
+++ b/data/scripts/maps/RustboroCity_House1.inc
diff --git a/data/scripts/maps/RustboroCity_House2.s b/data/scripts/maps/RustboroCity_House2.inc
index b448065f4..b448065f4 100644
--- a/data/scripts/maps/RustboroCity_House2.s
+++ b/data/scripts/maps/RustboroCity_House2.inc
diff --git a/data/scripts/maps/RustboroCity_House3.s b/data/scripts/maps/RustboroCity_House3.inc
index 0e81ed158..0e81ed158 100644
--- a/data/scripts/maps/RustboroCity_House3.s
+++ b/data/scripts/maps/RustboroCity_House3.inc
diff --git a/data/scripts/maps/RustboroCity_Mart.s b/data/scripts/maps/RustboroCity_Mart.inc
index 6b4ff3a77..6b4ff3a77 100644
--- a/data/scripts/maps/RustboroCity_Mart.s
+++ b/data/scripts/maps/RustboroCity_Mart.inc
diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_1F.s b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc
index 896e8e220..896e8e220 100644
--- a/data/scripts/maps/RustboroCity_PokemonCenter_1F.s
+++ b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc
diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_2F.s b/data/scripts/maps/RustboroCity_PokemonCenter_2F.inc
index d0ffc5435..d0ffc5435 100644
--- a/data/scripts/maps/RustboroCity_PokemonCenter_2F.s
+++ b/data/scripts/maps/RustboroCity_PokemonCenter_2F.inc
diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.s b/data/scripts/maps/RustboroCity_PokemonSchool.inc
index 8b037a3e7..8b037a3e7 100644
--- a/data/scripts/maps/RustboroCity_PokemonSchool.s
+++ b/data/scripts/maps/RustboroCity_PokemonSchool.inc
diff --git a/data/scripts/maps/RusturfTunnel.s b/data/scripts/maps/RusturfTunnel.inc
index 129bef7c9..129bef7c9 100644
--- a/data/scripts/maps/RusturfTunnel.s
+++ b/data/scripts/maps/RusturfTunnel.inc
diff --git a/data/scripts/maps/SSTidalCorridor.s b/data/scripts/maps/SSTidalCorridor.inc
index ff4857852..ff4857852 100644
--- a/data/scripts/maps/SSTidalCorridor.s
+++ b/data/scripts/maps/SSTidalCorridor.inc
diff --git a/data/scripts/maps/SSTidalLowerDeck.s b/data/scripts/maps/SSTidalLowerDeck.inc
index e91c20625..e91c20625 100644
--- a/data/scripts/maps/SSTidalLowerDeck.s
+++ b/data/scripts/maps/SSTidalLowerDeck.inc
diff --git a/data/scripts/maps/SSTidalRooms.s b/data/scripts/maps/SSTidalRooms.inc
index 4d588cd46..4d588cd46 100644
--- a/data/scripts/maps/SSTidalRooms.s
+++ b/data/scripts/maps/SSTidalRooms.inc
diff --git a/data/scripts/maps/SafariZone_Northeast.s b/data/scripts/maps/SafariZone_Northeast.inc
index 11e14da0f..11e14da0f 100644
--- a/data/scripts/maps/SafariZone_Northeast.s
+++ b/data/scripts/maps/SafariZone_Northeast.inc
diff --git a/data/scripts/maps/SafariZone_Northwest.s b/data/scripts/maps/SafariZone_Northwest.inc
index f17b7078d..f17b7078d 100644
--- a/data/scripts/maps/SafariZone_Northwest.s
+++ b/data/scripts/maps/SafariZone_Northwest.inc
diff --git a/data/scripts/maps/SafariZone_RestHouse.s b/data/scripts/maps/SafariZone_RestHouse.inc
index edaee1580..edaee1580 100644
--- a/data/scripts/maps/SafariZone_RestHouse.s
+++ b/data/scripts/maps/SafariZone_RestHouse.inc
diff --git a/data/scripts/maps/SafariZone_Southeast.s b/data/scripts/maps/SafariZone_Southeast.inc
index 196efbb35..196efbb35 100644
--- a/data/scripts/maps/SafariZone_Southeast.s
+++ b/data/scripts/maps/SafariZone_Southeast.inc
diff --git a/data/scripts/maps/SafariZone_Southwest.s b/data/scripts/maps/SafariZone_Southwest.inc
index 51bffeeab..51bffeeab 100644
--- a/data/scripts/maps/SafariZone_Southwest.s
+++ b/data/scripts/maps/SafariZone_Southwest.inc
diff --git a/data/scripts/maps/ScorchedSlab.s b/data/scripts/maps/ScorchedSlab.inc
index 112289083..112289083 100644
--- a/data/scripts/maps/ScorchedSlab.s
+++ b/data/scripts/maps/ScorchedSlab.inc
diff --git a/data/scripts/maps/SeafloorCavern_Entrance.s b/data/scripts/maps/SeafloorCavern_Entrance.inc
index 0bf99d2ad..0bf99d2ad 100644
--- a/data/scripts/maps/SeafloorCavern_Entrance.s
+++ b/data/scripts/maps/SeafloorCavern_Entrance.inc
diff --git a/data/scripts/maps/SeafloorCavern_Room1.s b/data/scripts/maps/SeafloorCavern_Room1.inc
index 6478efac1..6478efac1 100644
--- a/data/scripts/maps/SeafloorCavern_Room1.s
+++ b/data/scripts/maps/SeafloorCavern_Room1.inc
diff --git a/data/scripts/maps/SeafloorCavern_Room2.s b/data/scripts/maps/SeafloorCavern_Room2.inc
index b4507c8b9..b4507c8b9 100644
--- a/data/scripts/maps/SeafloorCavern_Room2.s
+++ b/data/scripts/maps/SeafloorCavern_Room2.inc
diff --git a/data/scripts/maps/SeafloorCavern_Room3.s b/data/scripts/maps/SeafloorCavern_Room3.inc
index 2ff8c4b26..2ff8c4b26 100644
--- a/data/scripts/maps/SeafloorCavern_Room3.s
+++ b/data/scripts/maps/SeafloorCavern_Room3.inc
diff --git a/data/scripts/maps/SeafloorCavern_Room4.s b/data/scripts/maps/SeafloorCavern_Room4.inc
index cbed797c0..cbed797c0 100644
--- a/data/scripts/maps/SeafloorCavern_Room4.s
+++ b/data/scripts/maps/SeafloorCavern_Room4.inc
diff --git a/data/scripts/maps/SeafloorCavern_Room5.s b/data/scripts/maps/SeafloorCavern_Room5.inc
index 79b65c2e6..79b65c2e6 100644
--- a/data/scripts/maps/SeafloorCavern_Room5.s
+++ b/data/scripts/maps/SeafloorCavern_Room5.inc
diff --git a/data/scripts/maps/SeafloorCavern_Room6.s b/data/scripts/maps/SeafloorCavern_Room6.inc
index 3ebeae07f..3ebeae07f 100644
--- a/data/scripts/maps/SeafloorCavern_Room6.s
+++ b/data/scripts/maps/SeafloorCavern_Room6.inc
diff --git a/data/scripts/maps/SeafloorCavern_Room7.s b/data/scripts/maps/SeafloorCavern_Room7.inc
index acad96ad0..acad96ad0 100644
--- a/data/scripts/maps/SeafloorCavern_Room7.s
+++ b/data/scripts/maps/SeafloorCavern_Room7.inc
diff --git a/data/scripts/maps/SeafloorCavern_Room8.s b/data/scripts/maps/SeafloorCavern_Room8.inc
index 117f9e6b5..117f9e6b5 100644
--- a/data/scripts/maps/SeafloorCavern_Room8.s
+++ b/data/scripts/maps/SeafloorCavern_Room8.inc
diff --git a/data/scripts/maps/SeafloorCavern_Room9.s b/data/scripts/maps/SeafloorCavern_Room9.inc
index ff8592f7d..ff8592f7d 100644
--- a/data/scripts/maps/SeafloorCavern_Room9.s
+++ b/data/scripts/maps/SeafloorCavern_Room9.inc
diff --git a/data/scripts/maps/SealedChamber_InnerRoom.s b/data/scripts/maps/SealedChamber_InnerRoom.inc
index 16d4c7003..16d4c7003 100644
--- a/data/scripts/maps/SealedChamber_InnerRoom.s
+++ b/data/scripts/maps/SealedChamber_InnerRoom.inc
diff --git a/data/scripts/maps/SealedChamber_OuterRoom.s b/data/scripts/maps/SealedChamber_OuterRoom.inc
index 83ca4e4df..83ca4e4df 100644
--- a/data/scripts/maps/SealedChamber_OuterRoom.s
+++ b/data/scripts/maps/SealedChamber_OuterRoom.inc
diff --git a/data/scripts/maps/SecretBase_BlueCave1.s b/data/scripts/maps/SecretBase_BlueCave1.inc
index bca6bee55..bca6bee55 100644
--- a/data/scripts/maps/SecretBase_BlueCave1.s
+++ b/data/scripts/maps/SecretBase_BlueCave1.inc
diff --git a/data/scripts/maps/SecretBase_BlueCave2.s b/data/scripts/maps/SecretBase_BlueCave2.inc
index 4fc579fb9..4fc579fb9 100644
--- a/data/scripts/maps/SecretBase_BlueCave2.s
+++ b/data/scripts/maps/SecretBase_BlueCave2.inc
diff --git a/data/scripts/maps/SecretBase_BlueCave3.s b/data/scripts/maps/SecretBase_BlueCave3.inc
index 0a8199f19..0a8199f19 100644
--- a/data/scripts/maps/SecretBase_BlueCave3.s
+++ b/data/scripts/maps/SecretBase_BlueCave3.inc
diff --git a/data/scripts/maps/SecretBase_BlueCave4.s b/data/scripts/maps/SecretBase_BlueCave4.inc
index 72c1e9612..72c1e9612 100644
--- a/data/scripts/maps/SecretBase_BlueCave4.s
+++ b/data/scripts/maps/SecretBase_BlueCave4.inc
diff --git a/data/scripts/maps/SecretBase_BrownCave1.s b/data/scripts/maps/SecretBase_BrownCave1.inc
index ddbf182e4..ddbf182e4 100644
--- a/data/scripts/maps/SecretBase_BrownCave1.s
+++ b/data/scripts/maps/SecretBase_BrownCave1.inc
diff --git a/data/scripts/maps/SecretBase_BrownCave2.s b/data/scripts/maps/SecretBase_BrownCave2.inc
index 06dcb6335..06dcb6335 100644
--- a/data/scripts/maps/SecretBase_BrownCave2.s
+++ b/data/scripts/maps/SecretBase_BrownCave2.inc
diff --git a/data/scripts/maps/SecretBase_BrownCave3.s b/data/scripts/maps/SecretBase_BrownCave3.inc
index a0a85dc11..a0a85dc11 100644
--- a/data/scripts/maps/SecretBase_BrownCave3.s
+++ b/data/scripts/maps/SecretBase_BrownCave3.inc
diff --git a/data/scripts/maps/SecretBase_BrownCave4.s b/data/scripts/maps/SecretBase_BrownCave4.inc
index 12d931e9e..12d931e9e 100644
--- a/data/scripts/maps/SecretBase_BrownCave4.s
+++ b/data/scripts/maps/SecretBase_BrownCave4.inc
diff --git a/data/scripts/maps/SecretBase_RedCave1.s b/data/scripts/maps/SecretBase_RedCave1.inc
index 77b99daec..77b99daec 100644
--- a/data/scripts/maps/SecretBase_RedCave1.s
+++ b/data/scripts/maps/SecretBase_RedCave1.inc
diff --git a/data/scripts/maps/SecretBase_RedCave2.s b/data/scripts/maps/SecretBase_RedCave2.inc
index 735d386fc..735d386fc 100644
--- a/data/scripts/maps/SecretBase_RedCave2.s
+++ b/data/scripts/maps/SecretBase_RedCave2.inc
diff --git a/data/scripts/maps/SecretBase_RedCave3.s b/data/scripts/maps/SecretBase_RedCave3.inc
index c9b72ca30..c9b72ca30 100644
--- a/data/scripts/maps/SecretBase_RedCave3.s
+++ b/data/scripts/maps/SecretBase_RedCave3.inc
diff --git a/data/scripts/maps/SecretBase_RedCave4.s b/data/scripts/maps/SecretBase_RedCave4.inc
index 6d2402f03..6d2402f03 100644
--- a/data/scripts/maps/SecretBase_RedCave4.s
+++ b/data/scripts/maps/SecretBase_RedCave4.inc
diff --git a/data/scripts/maps/SecretBase_Shrub1.s b/data/scripts/maps/SecretBase_Shrub1.inc
index 79116a0cf..79116a0cf 100644
--- a/data/scripts/maps/SecretBase_Shrub1.s
+++ b/data/scripts/maps/SecretBase_Shrub1.inc
diff --git a/data/scripts/maps/SecretBase_Shrub2.s b/data/scripts/maps/SecretBase_Shrub2.inc
index 49835f7f3..49835f7f3 100644
--- a/data/scripts/maps/SecretBase_Shrub2.s
+++ b/data/scripts/maps/SecretBase_Shrub2.inc
diff --git a/data/scripts/maps/SecretBase_Shrub3.s b/data/scripts/maps/SecretBase_Shrub3.inc
index 0aeb7bdf9..0aeb7bdf9 100644
--- a/data/scripts/maps/SecretBase_Shrub3.s
+++ b/data/scripts/maps/SecretBase_Shrub3.inc
diff --git a/data/scripts/maps/SecretBase_Shrub4.s b/data/scripts/maps/SecretBase_Shrub4.inc
index f131b308d..f131b308d 100644
--- a/data/scripts/maps/SecretBase_Shrub4.s
+++ b/data/scripts/maps/SecretBase_Shrub4.inc
diff --git a/data/scripts/maps/SecretBase_Tree1.s b/data/scripts/maps/SecretBase_Tree1.inc
index 7345c3bbb..7345c3bbb 100644
--- a/data/scripts/maps/SecretBase_Tree1.s
+++ b/data/scripts/maps/SecretBase_Tree1.inc
diff --git a/data/scripts/maps/SecretBase_Tree2.s b/data/scripts/maps/SecretBase_Tree2.inc
index 0f2976a8c..0f2976a8c 100644
--- a/data/scripts/maps/SecretBase_Tree2.s
+++ b/data/scripts/maps/SecretBase_Tree2.inc
diff --git a/data/scripts/maps/SecretBase_Tree3.s b/data/scripts/maps/SecretBase_Tree3.inc
index cb80b0d25..cb80b0d25 100644
--- a/data/scripts/maps/SecretBase_Tree3.s
+++ b/data/scripts/maps/SecretBase_Tree3.inc
diff --git a/data/scripts/maps/SecretBase_Tree4.s b/data/scripts/maps/SecretBase_Tree4.inc
index 0a6771740..0a6771740 100644
--- a/data/scripts/maps/SecretBase_Tree4.s
+++ b/data/scripts/maps/SecretBase_Tree4.inc
diff --git a/data/scripts/maps/SecretBase_YellowCave1.s b/data/scripts/maps/SecretBase_YellowCave1.inc
index b76a5f44e..b76a5f44e 100644
--- a/data/scripts/maps/SecretBase_YellowCave1.s
+++ b/data/scripts/maps/SecretBase_YellowCave1.inc
diff --git a/data/scripts/maps/SecretBase_YellowCave2.s b/data/scripts/maps/SecretBase_YellowCave2.inc
index 0bc1fc354..0bc1fc354 100644
--- a/data/scripts/maps/SecretBase_YellowCave2.s
+++ b/data/scripts/maps/SecretBase_YellowCave2.inc
diff --git a/data/scripts/maps/SecretBase_YellowCave3.s b/data/scripts/maps/SecretBase_YellowCave3.inc
index 137f04316..137f04316 100644
--- a/data/scripts/maps/SecretBase_YellowCave3.s
+++ b/data/scripts/maps/SecretBase_YellowCave3.inc
diff --git a/data/scripts/maps/SecretBase_YellowCave4.s b/data/scripts/maps/SecretBase_YellowCave4.inc
index 4ccbc2f0e..4ccbc2f0e 100644
--- a/data/scripts/maps/SecretBase_YellowCave4.s
+++ b/data/scripts/maps/SecretBase_YellowCave4.inc
diff --git a/data/scripts/maps/ShoalCave_HighTideEntranceRoom.s b/data/scripts/maps/ShoalCave_HighTideEntranceRoom.inc
index ae1f2c279..ae1f2c279 100644
--- a/data/scripts/maps/ShoalCave_HighTideEntranceRoom.s
+++ b/data/scripts/maps/ShoalCave_HighTideEntranceRoom.inc
diff --git a/data/scripts/maps/ShoalCave_HighTideInnerRoom.s b/data/scripts/maps/ShoalCave_HighTideInnerRoom.inc
index 9b47c97e7..9b47c97e7 100644
--- a/data/scripts/maps/ShoalCave_HighTideInnerRoom.s
+++ b/data/scripts/maps/ShoalCave_HighTideInnerRoom.inc
diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.s b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc
index 9b822a473..9b822a473 100644
--- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.s
+++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc
diff --git a/data/scripts/maps/ShoalCave_LowTideIceRoom.s b/data/scripts/maps/ShoalCave_LowTideIceRoom.inc
index 311ff2126..311ff2126 100644
--- a/data/scripts/maps/ShoalCave_LowTideIceRoom.s
+++ b/data/scripts/maps/ShoalCave_LowTideIceRoom.inc
diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.s b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc
index eab522a1f..eab522a1f 100644
--- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.s
+++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc
diff --git a/data/scripts/maps/ShoalCave_LowTideLowerRoom.s b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc
index dfcd5b83f..dfcd5b83f 100644
--- a/data/scripts/maps/ShoalCave_LowTideLowerRoom.s
+++ b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc
diff --git a/data/scripts/maps/ShoalCave_LowTideStairsRoom.s b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc
index 584a57818..584a57818 100644
--- a/data/scripts/maps/ShoalCave_LowTideStairsRoom.s
+++ b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc
diff --git a/data/scripts/maps/SingleBattleColosseum.s b/data/scripts/maps/SingleBattleColosseum.inc
index d3f2bdcaf..d3f2bdcaf 100644
--- a/data/scripts/maps/SingleBattleColosseum.s
+++ b/data/scripts/maps/SingleBattleColosseum.inc
diff --git a/data/scripts/maps/SkyPillar_1F.s b/data/scripts/maps/SkyPillar_1F.inc
index aa6c117da..aa6c117da 100644
--- a/data/scripts/maps/SkyPillar_1F.s
+++ b/data/scripts/maps/SkyPillar_1F.inc
diff --git a/data/scripts/maps/SkyPillar_2F.s b/data/scripts/maps/SkyPillar_2F.inc
index 62cb389f2..62cb389f2 100644
--- a/data/scripts/maps/SkyPillar_2F.s
+++ b/data/scripts/maps/SkyPillar_2F.inc
diff --git a/data/scripts/maps/SkyPillar_3F.s b/data/scripts/maps/SkyPillar_3F.inc
index 2dc97fc9c..2dc97fc9c 100644
--- a/data/scripts/maps/SkyPillar_3F.s
+++ b/data/scripts/maps/SkyPillar_3F.inc
diff --git a/data/scripts/maps/SkyPillar_4F.s b/data/scripts/maps/SkyPillar_4F.inc
index 5e1f7f4e6..5e1f7f4e6 100644
--- a/data/scripts/maps/SkyPillar_4F.s
+++ b/data/scripts/maps/SkyPillar_4F.inc
diff --git a/data/scripts/maps/SkyPillar_5F.s b/data/scripts/maps/SkyPillar_5F.inc
index 64e6d0f38..64e6d0f38 100644
--- a/data/scripts/maps/SkyPillar_5F.s
+++ b/data/scripts/maps/SkyPillar_5F.inc
diff --git a/data/scripts/maps/SkyPillar_Entrance.s b/data/scripts/maps/SkyPillar_Entrance.inc
index 7a3927332..7a3927332 100644
--- a/data/scripts/maps/SkyPillar_Entrance.s
+++ b/data/scripts/maps/SkyPillar_Entrance.inc
diff --git a/data/scripts/maps/SkyPillar_Outside.s b/data/scripts/maps/SkyPillar_Outside.inc
index 51e6a4e83..51e6a4e83 100644
--- a/data/scripts/maps/SkyPillar_Outside.s
+++ b/data/scripts/maps/SkyPillar_Outside.inc
diff --git a/data/scripts/maps/SkyPillar_Top.s b/data/scripts/maps/SkyPillar_Top.inc
index b28d89d93..b28d89d93 100644
--- a/data/scripts/maps/SkyPillar_Top.s
+++ b/data/scripts/maps/SkyPillar_Top.inc
diff --git a/data/scripts/maps/SlateportCity.s b/data/scripts/maps/SlateportCity.inc
index 19f9af2eb..19f9af2eb 100644
--- a/data/scripts/maps/SlateportCity.s
+++ b/data/scripts/maps/SlateportCity.inc
diff --git a/data/scripts/maps/SlateportCity_ContestHall.s b/data/scripts/maps/SlateportCity_ContestHall.inc
index 559719583..559719583 100644
--- a/data/scripts/maps/SlateportCity_ContestHall.s
+++ b/data/scripts/maps/SlateportCity_ContestHall.inc
diff --git a/data/scripts/maps/SlateportCity_ContestLobby.s b/data/scripts/maps/SlateportCity_ContestLobby.inc
index 46b595034..46b595034 100644
--- a/data/scripts/maps/SlateportCity_ContestLobby.s
+++ b/data/scripts/maps/SlateportCity_ContestLobby.inc
diff --git a/data/scripts/maps/SlateportCity_Harbor.s b/data/scripts/maps/SlateportCity_Harbor.inc
index d65d28877..d65d28877 100644
--- a/data/scripts/maps/SlateportCity_Harbor.s
+++ b/data/scripts/maps/SlateportCity_Harbor.inc
diff --git a/data/scripts/maps/SlateportCity_House1.s b/data/scripts/maps/SlateportCity_House1.inc
index 936d520dd..936d520dd 100644
--- a/data/scripts/maps/SlateportCity_House1.s
+++ b/data/scripts/maps/SlateportCity_House1.inc
diff --git a/data/scripts/maps/SlateportCity_House2.s b/data/scripts/maps/SlateportCity_House2.inc
index 2d50f0851..2d50f0851 100644
--- a/data/scripts/maps/SlateportCity_House2.s
+++ b/data/scripts/maps/SlateportCity_House2.inc
diff --git a/data/scripts/maps/SlateportCity_Mart.s b/data/scripts/maps/SlateportCity_Mart.inc
index 730afe6d4..730afe6d4 100644
--- a/data/scripts/maps/SlateportCity_Mart.s
+++ b/data/scripts/maps/SlateportCity_Mart.inc
diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.s b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
index 0bfeb4f5a..0bfeb4f5a 100644
--- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.s
+++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.s b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc
index 57bfbbd03..57bfbbd03 100644
--- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.s
+++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc
diff --git a/data/scripts/maps/SlateportCity_PokemonCenter_1F.s b/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc
index c550a6850..c550a6850 100644
--- a/data/scripts/maps/SlateportCity_PokemonCenter_1F.s
+++ b/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc
diff --git a/data/scripts/maps/SlateportCity_PokemonCenter_2F.s b/data/scripts/maps/SlateportCity_PokemonCenter_2F.inc
index 98782b24d..98782b24d 100644
--- a/data/scripts/maps/SlateportCity_PokemonCenter_2F.s
+++ b/data/scripts/maps/SlateportCity_PokemonCenter_2F.inc
diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.s b/data/scripts/maps/SlateportCity_PokemonFanClub.inc
index 8f0323f77..8f0323f77 100644
--- a/data/scripts/maps/SlateportCity_PokemonFanClub.s
+++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc
diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.s b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc
index 4c0596d29..4c0596d29 100644
--- a/data/scripts/maps/SlateportCity_SternsShipyard_1F.s
+++ b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc
diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_2F.s b/data/scripts/maps/SlateportCity_SternsShipyard_2F.inc
index df9227dd3..df9227dd3 100644
--- a/data/scripts/maps/SlateportCity_SternsShipyard_2F.s
+++ b/data/scripts/maps/SlateportCity_SternsShipyard_2F.inc
diff --git a/data/scripts/maps/SootopolisCity.s b/data/scripts/maps/SootopolisCity.inc
index 3d9c2dc93..3d9c2dc93 100644
--- a/data/scripts/maps/SootopolisCity.s
+++ b/data/scripts/maps/SootopolisCity.inc
diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.s b/data/scripts/maps/SootopolisCity_Gym_1F.inc
index e28ab4547..e28ab4547 100644
--- a/data/scripts/maps/SootopolisCity_Gym_1F.s
+++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc
diff --git a/data/scripts/maps/SootopolisCity_Gym_B1F.s b/data/scripts/maps/SootopolisCity_Gym_B1F.inc
index e54970701..e54970701 100644
--- a/data/scripts/maps/SootopolisCity_Gym_B1F.s
+++ b/data/scripts/maps/SootopolisCity_Gym_B1F.inc
diff --git a/data/scripts/maps/SootopolisCity_House1.s b/data/scripts/maps/SootopolisCity_House1.inc
index 604f04c4f..604f04c4f 100644
--- a/data/scripts/maps/SootopolisCity_House1.s
+++ b/data/scripts/maps/SootopolisCity_House1.inc
diff --git a/data/scripts/maps/SootopolisCity_House2.s b/data/scripts/maps/SootopolisCity_House2.inc
index 409a871a8..409a871a8 100644
--- a/data/scripts/maps/SootopolisCity_House2.s
+++ b/data/scripts/maps/SootopolisCity_House2.inc
diff --git a/data/scripts/maps/SootopolisCity_House3.s b/data/scripts/maps/SootopolisCity_House3.inc
index 88e35730e..88e35730e 100644
--- a/data/scripts/maps/SootopolisCity_House3.s
+++ b/data/scripts/maps/SootopolisCity_House3.inc
diff --git a/data/scripts/maps/SootopolisCity_House4.s b/data/scripts/maps/SootopolisCity_House4.inc
index ee3bfe61b..ee3bfe61b 100644
--- a/data/scripts/maps/SootopolisCity_House4.s
+++ b/data/scripts/maps/SootopolisCity_House4.inc
diff --git a/data/scripts/maps/SootopolisCity_House5.s b/data/scripts/maps/SootopolisCity_House5.inc
index 26e5c7d5c..26e5c7d5c 100644
--- a/data/scripts/maps/SootopolisCity_House5.s
+++ b/data/scripts/maps/SootopolisCity_House5.inc
diff --git a/data/scripts/maps/SootopolisCity_House6.s b/data/scripts/maps/SootopolisCity_House6.inc
index cccfa78ee..cccfa78ee 100644
--- a/data/scripts/maps/SootopolisCity_House6.s
+++ b/data/scripts/maps/SootopolisCity_House6.inc
diff --git a/data/scripts/maps/SootopolisCity_House7.s b/data/scripts/maps/SootopolisCity_House7.inc
index a9b06b176..a9b06b176 100644
--- a/data/scripts/maps/SootopolisCity_House7.s
+++ b/data/scripts/maps/SootopolisCity_House7.inc
diff --git a/data/scripts/maps/SootopolisCity_House8.s b/data/scripts/maps/SootopolisCity_House8.inc
index c52965124..c52965124 100644
--- a/data/scripts/maps/SootopolisCity_House8.s
+++ b/data/scripts/maps/SootopolisCity_House8.inc
diff --git a/data/scripts/maps/SootopolisCity_Mart.s b/data/scripts/maps/SootopolisCity_Mart.inc
index 9f37f9d0b..9f37f9d0b 100644
--- a/data/scripts/maps/SootopolisCity_Mart.s
+++ b/data/scripts/maps/SootopolisCity_Mart.inc
diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.s b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc
index 29cc06584..29cc06584 100644
--- a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.s
+++ b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc
diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_2F.s b/data/scripts/maps/SootopolisCity_PokemonCenter_2F.inc
index 0547e666f..0547e666f 100644
--- a/data/scripts/maps/SootopolisCity_PokemonCenter_2F.s
+++ b/data/scripts/maps/SootopolisCity_PokemonCenter_2F.inc
diff --git a/data/scripts/maps/SouthernIsland_Exterior.s b/data/scripts/maps/SouthernIsland_Exterior.inc
index 9723647cd..9723647cd 100644
--- a/data/scripts/maps/SouthernIsland_Exterior.s
+++ b/data/scripts/maps/SouthernIsland_Exterior.inc
diff --git a/data/scripts/maps/SouthernIsland_Interior.s b/data/scripts/maps/SouthernIsland_Interior.inc
index d3b944f29..d3b944f29 100644
--- a/data/scripts/maps/SouthernIsland_Interior.s
+++ b/data/scripts/maps/SouthernIsland_Interior.inc
diff --git a/data/scripts/maps/TradeCenter.s b/data/scripts/maps/TradeCenter.inc
index dadb3e875..dadb3e875 100644
--- a/data/scripts/maps/TradeCenter.s
+++ b/data/scripts/maps/TradeCenter.inc
diff --git a/data/scripts/maps/Underwater1.s b/data/scripts/maps/Underwater1.inc
index ab2e910fe..ab2e910fe 100644
--- a/data/scripts/maps/Underwater1.s
+++ b/data/scripts/maps/Underwater1.inc
diff --git a/data/scripts/maps/Underwater2.s b/data/scripts/maps/Underwater2.inc
index cf60a2b34..cf60a2b34 100644
--- a/data/scripts/maps/Underwater2.s
+++ b/data/scripts/maps/Underwater2.inc
diff --git a/data/scripts/maps/Underwater3.s b/data/scripts/maps/Underwater3.inc
index c34b07b1c..c34b07b1c 100644
--- a/data/scripts/maps/Underwater3.s
+++ b/data/scripts/maps/Underwater3.inc
diff --git a/data/scripts/maps/Underwater4.s b/data/scripts/maps/Underwater4.inc
index 0d2256e07..0d2256e07 100644
--- a/data/scripts/maps/Underwater4.s
+++ b/data/scripts/maps/Underwater4.inc
diff --git a/data/scripts/maps/Underwater_Route134.s b/data/scripts/maps/Underwater_Route134.inc
index ee79f9799..ee79f9799 100644
--- a/data/scripts/maps/Underwater_Route134.s
+++ b/data/scripts/maps/Underwater_Route134.inc
diff --git a/data/scripts/maps/Underwater_SeafloorCavern.s b/data/scripts/maps/Underwater_SeafloorCavern.inc
index c879ec609..c879ec609 100644
--- a/data/scripts/maps/Underwater_SeafloorCavern.s
+++ b/data/scripts/maps/Underwater_SeafloorCavern.inc
diff --git a/data/scripts/maps/Underwater_SealedChamber.s b/data/scripts/maps/Underwater_SealedChamber.inc
index d7e7aabcb..d7e7aabcb 100644
--- a/data/scripts/maps/Underwater_SealedChamber.s
+++ b/data/scripts/maps/Underwater_SealedChamber.inc
diff --git a/data/scripts/maps/Underwater_SootopolisCity.s b/data/scripts/maps/Underwater_SootopolisCity.inc
index 624c2c83e..624c2c83e 100644
--- a/data/scripts/maps/Underwater_SootopolisCity.s
+++ b/data/scripts/maps/Underwater_SootopolisCity.inc
diff --git a/data/scripts/maps/UnknownMap_25_29.s b/data/scripts/maps/UnknownMap_25_29.inc
index a62e0c9f3..a62e0c9f3 100644
--- a/data/scripts/maps/UnknownMap_25_29.s
+++ b/data/scripts/maps/UnknownMap_25_29.inc
diff --git a/data/scripts/maps/UnknownMap_25_30.s b/data/scripts/maps/UnknownMap_25_30.inc
index 70a1f0ac2..70a1f0ac2 100644
--- a/data/scripts/maps/UnknownMap_25_30.s
+++ b/data/scripts/maps/UnknownMap_25_30.inc
diff --git a/data/scripts/maps/UnknownMap_25_31.s b/data/scripts/maps/UnknownMap_25_31.inc
index 44c67cab5..44c67cab5 100644
--- a/data/scripts/maps/UnknownMap_25_31.s
+++ b/data/scripts/maps/UnknownMap_25_31.inc
diff --git a/data/scripts/maps/UnknownMap_25_32.s b/data/scripts/maps/UnknownMap_25_32.inc
index 485a626e6..485a626e6 100644
--- a/data/scripts/maps/UnknownMap_25_32.s
+++ b/data/scripts/maps/UnknownMap_25_32.inc
diff --git a/data/scripts/maps/UnknownMap_25_33.s b/data/scripts/maps/UnknownMap_25_33.inc
index 68feb9cc6..68feb9cc6 100644
--- a/data/scripts/maps/UnknownMap_25_33.s
+++ b/data/scripts/maps/UnknownMap_25_33.inc
diff --git a/data/scripts/maps/UnknownMap_25_34.s b/data/scripts/maps/UnknownMap_25_34.inc
index f4f1fe61c..f4f1fe61c 100644
--- a/data/scripts/maps/UnknownMap_25_34.s
+++ b/data/scripts/maps/UnknownMap_25_34.inc
diff --git a/data/scripts/maps/VerdanturfTown.s b/data/scripts/maps/VerdanturfTown.inc
index 610643823..610643823 100644
--- a/data/scripts/maps/VerdanturfTown.s
+++ b/data/scripts/maps/VerdanturfTown.inc
diff --git a/data/scripts/maps/VerdanturfTown_ContestHall.s b/data/scripts/maps/VerdanturfTown_ContestHall.inc
index 380385a88..380385a88 100644
--- a/data/scripts/maps/VerdanturfTown_ContestHall.s
+++ b/data/scripts/maps/VerdanturfTown_ContestHall.inc
diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.s b/data/scripts/maps/VerdanturfTown_ContestLobby.inc
index 7033e4fb1..7033e4fb1 100644
--- a/data/scripts/maps/VerdanturfTown_ContestLobby.s
+++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc
diff --git a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.s b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc
index 2dc2e1355..2dc2e1355 100644
--- a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.s
+++ b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc
diff --git a/data/scripts/maps/VerdanturfTown_House.s b/data/scripts/maps/VerdanturfTown_House.inc
index 45a22ae93..45a22ae93 100644
--- a/data/scripts/maps/VerdanturfTown_House.s
+++ b/data/scripts/maps/VerdanturfTown_House.inc
diff --git a/data/scripts/maps/VerdanturfTown_Mart.s b/data/scripts/maps/VerdanturfTown_Mart.inc
index 4227dc8b1..4227dc8b1 100644
--- a/data/scripts/maps/VerdanturfTown_Mart.s
+++ b/data/scripts/maps/VerdanturfTown_Mart.inc
diff --git a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.s b/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc
index e0fee3fb8..e0fee3fb8 100644
--- a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.s
+++ b/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc
diff --git a/data/scripts/maps/VerdanturfTown_PokemonCenter_2F.s b/data/scripts/maps/VerdanturfTown_PokemonCenter_2F.inc
index ec52d45a7..ec52d45a7 100644
--- a/data/scripts/maps/VerdanturfTown_PokemonCenter_2F.s
+++ b/data/scripts/maps/VerdanturfTown_PokemonCenter_2F.inc
diff --git a/data/scripts/maps/VerdanturfTown_WandasHouse.s b/data/scripts/maps/VerdanturfTown_WandasHouse.inc
index 80bd6151d..80bd6151d 100644
--- a/data/scripts/maps/VerdanturfTown_WandasHouse.s
+++ b/data/scripts/maps/VerdanturfTown_WandasHouse.inc
diff --git a/data/scripts/maps/VictoryRoad_1F.s b/data/scripts/maps/VictoryRoad_1F.inc
index b1f6e732b..b1f6e732b 100644
--- a/data/scripts/maps/VictoryRoad_1F.s
+++ b/data/scripts/maps/VictoryRoad_1F.inc
diff --git a/data/scripts/maps/VictoryRoad_B1F.s b/data/scripts/maps/VictoryRoad_B1F.inc
index e07cd4286..e07cd4286 100644
--- a/data/scripts/maps/VictoryRoad_B1F.s
+++ b/data/scripts/maps/VictoryRoad_B1F.inc
diff --git a/data/scripts/maps/VictoryRoad_B2F.s b/data/scripts/maps/VictoryRoad_B2F.inc
index 6b8fe2569..6b8fe2569 100644
--- a/data/scripts/maps/VictoryRoad_B2F.s
+++ b/data/scripts/maps/VictoryRoad_B2F.inc