398 files changed, 0 insertions, 0 deletions
diff --git a/data/maps/_assets.s b/data/maps/_assets.inc
index a9cc15869..a9cc15869 100644
--- a/data/maps/_assets.s
+++ b/data/maps/_assets.inc
diff --git a/data/maps/_groups.s b/data/maps/_groups.inc
index 478f03e86..478f03e86 100644
--- a/data/maps/_groups.s
+++ b/data/maps/_groups.inc
diff --git a/data/maps/attributes_table.s b/data/maps/attributes_table.inc
index 41b0df228..41b0df228 100644
--- a/data/maps/attributes_table.s
+++ b/data/maps/attributes_table.inc
diff --git a/data/maps/connections.s b/data/maps/connections.inc
index 9e5f3a5a5..9e5f3a5a5 100644
--- a/data/maps/connections.s
+++ b/data/maps/connections.inc
diff --git a/data/maps/events/AbandonedShip_CaptainsOffice.s b/data/maps/events/AbandonedShip_CaptainsOffice.inc
index e05bee18c..e05bee18c 100644
--- a/data/maps/events/AbandonedShip_CaptainsOffice.s
+++ b/data/maps/events/AbandonedShip_CaptainsOffice.inc
diff --git a/data/maps/events/AbandonedShip_Corridors_1F.s b/data/maps/events/AbandonedShip_Corridors_1F.inc
index 8a42d3204..8a42d3204 100644
--- a/data/maps/events/AbandonedShip_Corridors_1F.s
+++ b/data/maps/events/AbandonedShip_Corridors_1F.inc
diff --git a/data/maps/events/AbandonedShip_Corridors_B1F.s b/data/maps/events/AbandonedShip_Corridors_B1F.inc
index 7b50cf2fe..7b50cf2fe 100644
--- a/data/maps/events/AbandonedShip_Corridors_B1F.s
+++ b/data/maps/events/AbandonedShip_Corridors_B1F.inc
diff --git a/data/maps/events/AbandonedShip_Deck.s b/data/maps/events/AbandonedShip_Deck.inc
index 6988f8568..6988f8568 100644
--- a/data/maps/events/AbandonedShip_Deck.s
+++ b/data/maps/events/AbandonedShip_Deck.inc
diff --git a/data/maps/events/AbandonedShip_HiddenFloorCorridors.s b/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc
index e5f17046d..e5f17046d 100644
--- a/data/maps/events/AbandonedShip_HiddenFloorCorridors.s
+++ b/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc
diff --git a/data/maps/events/AbandonedShip_HiddenFloorRooms.s b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc
index e110e051d..e110e051d 100644
--- a/data/maps/events/AbandonedShip_HiddenFloorRooms.s
+++ b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc
diff --git a/data/maps/events/AbandonedShip_Room_B1F.s b/data/maps/events/AbandonedShip_Room_B1F.inc
index 9213f3e98..9213f3e98 100644
--- a/data/maps/events/AbandonedShip_Room_B1F.s
+++ b/data/maps/events/AbandonedShip_Room_B1F.inc
diff --git a/data/maps/events/AbandonedShip_Rooms2_1F.s b/data/maps/events/AbandonedShip_Rooms2_1F.inc
index 842f972fa..842f972fa 100644
--- a/data/maps/events/AbandonedShip_Rooms2_1F.s
+++ b/data/maps/events/AbandonedShip_Rooms2_1F.inc
diff --git a/data/maps/events/AbandonedShip_Rooms2_B1F.s b/data/maps/events/AbandonedShip_Rooms2_B1F.inc
index 2ad55a5e9..2ad55a5e9 100644
--- a/data/maps/events/AbandonedShip_Rooms2_B1F.s
+++ b/data/maps/events/AbandonedShip_Rooms2_B1F.inc
diff --git a/data/maps/events/AbandonedShip_Rooms_1F.s b/data/maps/events/AbandonedShip_Rooms_1F.inc
index 90578df28..90578df28 100644
--- a/data/maps/events/AbandonedShip_Rooms_1F.s
+++ b/data/maps/events/AbandonedShip_Rooms_1F.inc
diff --git a/data/maps/events/AbandonedShip_Rooms_B1F.s b/data/maps/events/AbandonedShip_Rooms_B1F.inc
index 692883bec..692883bec 100644
--- a/data/maps/events/AbandonedShip_Rooms_B1F.s
+++ b/data/maps/events/AbandonedShip_Rooms_B1F.inc
diff --git a/data/maps/events/AbandonedShip_Underwater1.s b/data/maps/events/AbandonedShip_Underwater1.inc
index 9a4634860..9a4634860 100644
--- a/data/maps/events/AbandonedShip_Underwater1.s
+++ b/data/maps/events/AbandonedShip_Underwater1.inc
diff --git a/data/maps/events/AbandonedShip_Underwater2.s b/data/maps/events/AbandonedShip_Underwater2.inc
index a3a181773..a3a181773 100644
--- a/data/maps/events/AbandonedShip_Underwater2.s
+++ b/data/maps/events/AbandonedShip_Underwater2.inc
diff --git a/data/maps/events/AncientTomb.s b/data/maps/events/AncientTomb.inc
index 1f527288b..1f527288b 100644
--- a/data/maps/events/AncientTomb.s
+++ b/data/maps/events/AncientTomb.inc
diff --git a/data/maps/events/AquaHideout_1F.s b/data/maps/events/AquaHideout_1F.inc
index 5c59bbf12..5c59bbf12 100644
--- a/data/maps/events/AquaHideout_1F.s
+++ b/data/maps/events/AquaHideout_1F.inc
diff --git a/data/maps/events/AquaHideout_B1F.s b/data/maps/events/AquaHideout_B1F.inc
index 742761833..742761833 100644
--- a/data/maps/events/AquaHideout_B1F.s
+++ b/data/maps/events/AquaHideout_B1F.inc
diff --git a/data/maps/events/AquaHideout_B2F.s b/data/maps/events/AquaHideout_B2F.inc
index d2cce8ab9..d2cce8ab9 100644
--- a/data/maps/events/AquaHideout_B2F.s
+++ b/data/maps/events/AquaHideout_B2F.inc
diff --git a/data/maps/events/BattleTower_BattleRoom.s b/data/maps/events/BattleTower_BattleRoom.inc
index dda5621b6..dda5621b6 100644
--- a/data/maps/events/BattleTower_BattleRoom.s
+++ b/data/maps/events/BattleTower_BattleRoom.inc
diff --git a/data/maps/events/BattleTower_Corridor.s b/data/maps/events/BattleTower_Corridor.inc
index 33b5a779c..33b5a779c 100644
--- a/data/maps/events/BattleTower_Corridor.s
+++ b/data/maps/events/BattleTower_Corridor.inc
diff --git a/data/maps/events/BattleTower_Elevator.s b/data/maps/events/BattleTower_Elevator.inc
index 7594028b6..7594028b6 100644
--- a/data/maps/events/BattleTower_Elevator.s
+++ b/data/maps/events/BattleTower_Elevator.inc
diff --git a/data/maps/events/BattleTower_Lobby.s b/data/maps/events/BattleTower_Lobby.inc
index 6d4e15f7a..6d4e15f7a 100644
--- a/data/maps/events/BattleTower_Lobby.s
+++ b/data/maps/events/BattleTower_Lobby.inc
diff --git a/data/maps/events/BattleTower_Outside.s b/data/maps/events/BattleTower_Outside.inc
index 04085c346..04085c346 100644
--- a/data/maps/events/BattleTower_Outside.s
+++ b/data/maps/events/BattleTower_Outside.inc
diff --git a/data/maps/events/CaveOfOrigin_1F.s b/data/maps/events/CaveOfOrigin_1F.inc
index 43b0b615d..43b0b615d 100644
--- a/data/maps/events/CaveOfOrigin_1F.s
+++ b/data/maps/events/CaveOfOrigin_1F.inc
diff --git a/data/maps/events/CaveOfOrigin_B1F.s b/data/maps/events/CaveOfOrigin_B1F.inc
index 0a3df0655..0a3df0655 100644
--- a/data/maps/events/CaveOfOrigin_B1F.s
+++ b/data/maps/events/CaveOfOrigin_B1F.inc
diff --git a/data/maps/events/CaveOfOrigin_B2F.s b/data/maps/events/CaveOfOrigin_B2F.inc
index 9c04629f0..9c04629f0 100644
--- a/data/maps/events/CaveOfOrigin_B2F.s
+++ b/data/maps/events/CaveOfOrigin_B2F.inc
diff --git a/data/maps/events/CaveOfOrigin_B3F.s b/data/maps/events/CaveOfOrigin_B3F.inc
index 0d0b44eea..0d0b44eea 100644
--- a/data/maps/events/CaveOfOrigin_B3F.s
+++ b/data/maps/events/CaveOfOrigin_B3F.inc
diff --git a/data/maps/events/CaveOfOrigin_B4F.s b/data/maps/events/CaveOfOrigin_B4F.inc
index 3b4beb038..3b4beb038 100644
--- a/data/maps/events/CaveOfOrigin_B4F.s
+++ b/data/maps/events/CaveOfOrigin_B4F.inc
diff --git a/data/maps/events/CaveOfOrigin_Entrance.s b/data/maps/events/CaveOfOrigin_Entrance.inc
index 4e61e3d82..4e61e3d82 100644
--- a/data/maps/events/CaveOfOrigin_Entrance.s
+++ b/data/maps/events/CaveOfOrigin_Entrance.inc
diff --git a/data/maps/events/DesertRuins.s b/data/maps/events/DesertRuins.inc
index 849c7f729..849c7f729 100644
--- a/data/maps/events/DesertRuins.s
+++ b/data/maps/events/DesertRuins.inc
diff --git a/data/maps/events/DewfordTown.s b/data/maps/events/DewfordTown.inc
index 8a5fc1fed..8a5fc1fed 100644
--- a/data/maps/events/DewfordTown.s
+++ b/data/maps/events/DewfordTown.inc
diff --git a/data/maps/events/DewfordTown_Gym.s b/data/maps/events/DewfordTown_Gym.inc
index 2e36395c1..2e36395c1 100644
--- a/data/maps/events/DewfordTown_Gym.s
+++ b/data/maps/events/DewfordTown_Gym.inc
diff --git a/data/maps/events/DewfordTown_Hall.s b/data/maps/events/DewfordTown_Hall.inc
index d58fbfbd4..d58fbfbd4 100644
--- a/data/maps/events/DewfordTown_Hall.s
+++ b/data/maps/events/DewfordTown_Hall.inc
diff --git a/data/maps/events/DewfordTown_House1.s b/data/maps/events/DewfordTown_House1.inc
index 9bed6ac7a..9bed6ac7a 100644
--- a/data/maps/events/DewfordTown_House1.s
+++ b/data/maps/events/DewfordTown_House1.inc
diff --git a/data/maps/events/DewfordTown_House2.s b/data/maps/events/DewfordTown_House2.inc
index eae9ff28e..eae9ff28e 100644
--- a/data/maps/events/DewfordTown_House2.s
+++ b/data/maps/events/DewfordTown_House2.inc
diff --git a/data/maps/events/DewfordTown_PokemonCenter_1F.s b/data/maps/events/DewfordTown_PokemonCenter_1F.inc
index a870483b3..a870483b3 100644
--- a/data/maps/events/DewfordTown_PokemonCenter_1F.s
+++ b/data/maps/events/DewfordTown_PokemonCenter_1F.inc
diff --git a/data/maps/events/DewfordTown_PokemonCenter_2F.s b/data/maps/events/DewfordTown_PokemonCenter_2F.inc
index 0d17672de..0d17672de 100644
--- a/data/maps/events/DewfordTown_PokemonCenter_2F.s
+++ b/data/maps/events/DewfordTown_PokemonCenter_2F.inc
diff --git a/data/maps/events/DoubleBattleColosseum.s b/data/maps/events/DoubleBattleColosseum.inc
index f6142c4b4..f6142c4b4 100644
--- a/data/maps/events/DoubleBattleColosseum.s
+++ b/data/maps/events/DoubleBattleColosseum.inc
diff --git a/data/maps/events/EverGrandeCity.s b/data/maps/events/EverGrandeCity.inc
index 41fd48f06..41fd48f06 100644
--- a/data/maps/events/EverGrandeCity.s
+++ b/data/maps/events/EverGrandeCity.inc
diff --git a/data/maps/events/EverGrandeCity_ChampionsRoom.s b/data/maps/events/EverGrandeCity_ChampionsRoom.inc
index 5d97fe89c..5d97fe89c 100644
--- a/data/maps/events/EverGrandeCity_ChampionsRoom.s
+++ b/data/maps/events/EverGrandeCity_ChampionsRoom.inc
diff --git a/data/maps/events/EverGrandeCity_Corridor1.s b/data/maps/events/EverGrandeCity_Corridor1.inc
index df9176426..df9176426 100644
--- a/data/maps/events/EverGrandeCity_Corridor1.s
+++ b/data/maps/events/EverGrandeCity_Corridor1.inc
diff --git a/data/maps/events/EverGrandeCity_Corridor2.s b/data/maps/events/EverGrandeCity_Corridor2.inc
index 35dfa181c..35dfa181c 100644
--- a/data/maps/events/EverGrandeCity_Corridor2.s
+++ b/data/maps/events/EverGrandeCity_Corridor2.inc
diff --git a/data/maps/events/EverGrandeCity_Corridor3.s b/data/maps/events/EverGrandeCity_Corridor3.inc
index daf135a5f..daf135a5f 100644
--- a/data/maps/events/EverGrandeCity_Corridor3.s
+++ b/data/maps/events/EverGrandeCity_Corridor3.inc
diff --git a/data/maps/events/EverGrandeCity_Corridor4.s b/data/maps/events/EverGrandeCity_Corridor4.inc
index 55757ea4c..55757ea4c 100644
--- a/data/maps/events/EverGrandeCity_Corridor4.s
+++ b/data/maps/events/EverGrandeCity_Corridor4.inc
diff --git a/data/maps/events/EverGrandeCity_Corridor5.s b/data/maps/events/EverGrandeCity_Corridor5.inc
index bd07dd7e0..bd07dd7e0 100644
--- a/data/maps/events/EverGrandeCity_Corridor5.s
+++ b/data/maps/events/EverGrandeCity_Corridor5.inc
diff --git a/data/maps/events/EverGrandeCity_DrakesRoom.s b/data/maps/events/EverGrandeCity_DrakesRoom.inc
index a925ffed8..a925ffed8 100644
--- a/data/maps/events/EverGrandeCity_DrakesRoom.s
+++ b/data/maps/events/EverGrandeCity_DrakesRoom.inc
diff --git a/data/maps/events/EverGrandeCity_GlaciasRoom.s b/data/maps/events/EverGrandeCity_GlaciasRoom.inc
index 806cfe7e1..806cfe7e1 100644
--- a/data/maps/events/EverGrandeCity_GlaciasRoom.s
+++ b/data/maps/events/EverGrandeCity_GlaciasRoom.inc
diff --git a/data/maps/events/EverGrandeCity_HallOfFame.s b/data/maps/events/EverGrandeCity_HallOfFame.inc
index 1860ee397..1860ee397 100644
--- a/data/maps/events/EverGrandeCity_HallOfFame.s
+++ b/data/maps/events/EverGrandeCity_HallOfFame.inc
diff --git a/data/maps/events/EverGrandeCity_PhoebesRoom.s b/data/maps/events/EverGrandeCity_PhoebesRoom.inc
index aab61bcf4..aab61bcf4 100644
--- a/data/maps/events/EverGrandeCity_PhoebesRoom.s
+++ b/data/maps/events/EverGrandeCity_PhoebesRoom.inc
diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_1F.s b/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc
index 25aee1300..25aee1300 100644
--- a/data/maps/events/EverGrandeCity_PokemonCenter_1F.s
+++ b/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc
diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_2F.s b/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc
index 2bc94cdcc..2bc94cdcc 100644
--- a/data/maps/events/EverGrandeCity_PokemonCenter_2F.s
+++ b/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc
diff --git a/data/maps/events/EverGrandeCity_PokemonLeague.s b/data/maps/events/EverGrandeCity_PokemonLeague.inc
index d60761727..d60761727 100644
--- a/data/maps/events/EverGrandeCity_PokemonLeague.s
+++ b/data/maps/events/EverGrandeCity_PokemonLeague.inc
diff --git a/data/maps/events/EverGrandeCity_SidneysRoom.s b/data/maps/events/EverGrandeCity_SidneysRoom.inc
index ff370d4ef..ff370d4ef 100644
--- a/data/maps/events/EverGrandeCity_SidneysRoom.s
+++ b/data/maps/events/EverGrandeCity_SidneysRoom.inc
diff --git a/data/maps/events/FallarborTown.s b/data/maps/events/FallarborTown.inc
index 2d69688e7..2d69688e7 100644
--- a/data/maps/events/FallarborTown.s
+++ b/data/maps/events/FallarborTown.inc
diff --git a/data/maps/events/FallarborTown_ContestHall.s b/data/maps/events/FallarborTown_ContestHall.inc
index 93b43eccc..93b43eccc 100644
--- a/data/maps/events/FallarborTown_ContestHall.s
+++ b/data/maps/events/FallarborTown_ContestHall.inc
diff --git a/data/maps/events/FallarborTown_ContestLobby.s b/data/maps/events/FallarborTown_ContestLobby.inc
index af7ca5ed1..af7ca5ed1 100644
--- a/data/maps/events/FallarborTown_ContestLobby.s
+++ b/data/maps/events/FallarborTown_ContestLobby.inc
diff --git a/data/maps/events/FallarborTown_House1.s b/data/maps/events/FallarborTown_House1.inc
index d4cd3e0c9..d4cd3e0c9 100644
--- a/data/maps/events/FallarborTown_House1.s
+++ b/data/maps/events/FallarborTown_House1.inc
diff --git a/data/maps/events/FallarborTown_House2.s b/data/maps/events/FallarborTown_House2.inc
index 0b1c64162..0b1c64162 100644
--- a/data/maps/events/FallarborTown_House2.s
+++ b/data/maps/events/FallarborTown_House2.inc
diff --git a/data/maps/events/FallarborTown_Mart.s b/data/maps/events/FallarborTown_Mart.inc
index 584b70447..584b70447 100644
--- a/data/maps/events/FallarborTown_Mart.s
+++ b/data/maps/events/FallarborTown_Mart.inc
diff --git a/data/maps/events/FallarborTown_PokemonCenter_1F.s b/data/maps/events/FallarborTown_PokemonCenter_1F.inc
index 16f90af9d..16f90af9d 100644
--- a/data/maps/events/FallarborTown_PokemonCenter_1F.s
+++ b/data/maps/events/FallarborTown_PokemonCenter_1F.inc
diff --git a/data/maps/events/FallarborTown_PokemonCenter_2F.s b/data/maps/events/FallarborTown_PokemonCenter_2F.inc
index 05ea78f75..05ea78f75 100644
--- a/data/maps/events/FallarborTown_PokemonCenter_2F.s
+++ b/data/maps/events/FallarborTown_PokemonCenter_2F.inc
diff --git a/data/maps/events/FieryPath.s b/data/maps/events/FieryPath.inc
index 01b7b3efe..01b7b3efe 100644
--- a/data/maps/events/FieryPath.s
+++ b/data/maps/events/FieryPath.inc
diff --git a/data/maps/events/FortreeCity.s b/data/maps/events/FortreeCity.inc
index 437852d25..437852d25 100644
--- a/data/maps/events/FortreeCity.s
+++ b/data/maps/events/FortreeCity.inc
diff --git a/data/maps/events/FortreeCity_DecorationShop.s b/data/maps/events/FortreeCity_DecorationShop.inc
index cc9894b5c..cc9894b5c 100644
--- a/data/maps/events/FortreeCity_DecorationShop.s
+++ b/data/maps/events/FortreeCity_DecorationShop.inc
diff --git a/data/maps/events/FortreeCity_Gym.s b/data/maps/events/FortreeCity_Gym.inc
index ad983f81b..ad983f81b 100644
--- a/data/maps/events/FortreeCity_Gym.s
+++ b/data/maps/events/FortreeCity_Gym.inc
diff --git a/data/maps/events/FortreeCity_House1.s b/data/maps/events/FortreeCity_House1.inc
index ff383b464..ff383b464 100644
--- a/data/maps/events/FortreeCity_House1.s
+++ b/data/maps/events/FortreeCity_House1.inc
diff --git a/data/maps/events/FortreeCity_House2.s b/data/maps/events/FortreeCity_House2.inc
index 3b0943b2e..3b0943b2e 100644
--- a/data/maps/events/FortreeCity_House2.s
+++ b/data/maps/events/FortreeCity_House2.inc
diff --git a/data/maps/events/FortreeCity_House3.s b/data/maps/events/FortreeCity_House3.inc
index b0b5a7412..b0b5a7412 100644
--- a/data/maps/events/FortreeCity_House3.s
+++ b/data/maps/events/FortreeCity_House3.inc
diff --git a/data/maps/events/FortreeCity_House4.s b/data/maps/events/FortreeCity_House4.inc
index 8b85660c7..8b85660c7 100644
--- a/data/maps/events/FortreeCity_House4.s
+++ b/data/maps/events/FortreeCity_House4.inc
diff --git a/data/maps/events/FortreeCity_House5.s b/data/maps/events/FortreeCity_House5.inc
index ffaa59e69..ffaa59e69 100644
--- a/data/maps/events/FortreeCity_House5.s
+++ b/data/maps/events/FortreeCity_House5.inc
diff --git a/data/maps/events/FortreeCity_Mart.s b/data/maps/events/FortreeCity_Mart.inc
index 5d1996fc2..5d1996fc2 100644
--- a/data/maps/events/FortreeCity_Mart.s
+++ b/data/maps/events/FortreeCity_Mart.inc
diff --git a/data/maps/events/FortreeCity_PokemonCenter_1F.s b/data/maps/events/FortreeCity_PokemonCenter_1F.inc
index bd7877e24..bd7877e24 100644
--- a/data/maps/events/FortreeCity_PokemonCenter_1F.s
+++ b/data/maps/events/FortreeCity_PokemonCenter_1F.inc
diff --git a/data/maps/events/FortreeCity_PokemonCenter_2F.s b/data/maps/events/FortreeCity_PokemonCenter_2F.inc
index b6a10428c..b6a10428c 100644
--- a/data/maps/events/FortreeCity_PokemonCenter_2F.s
+++ b/data/maps/events/FortreeCity_PokemonCenter_2F.inc
diff --git a/data/maps/events/GraniteCave_1F.s b/data/maps/events/GraniteCave_1F.inc
index 760c1b0e9..760c1b0e9 100644
--- a/data/maps/events/GraniteCave_1F.s
+++ b/data/maps/events/GraniteCave_1F.inc
diff --git a/data/maps/events/GraniteCave_B1F.s b/data/maps/events/GraniteCave_B1F.inc
index 2bfd8257d..2bfd8257d 100644
--- a/data/maps/events/GraniteCave_B1F.s
+++ b/data/maps/events/GraniteCave_B1F.inc
diff --git a/data/maps/events/GraniteCave_B2F.s b/data/maps/events/GraniteCave_B2F.inc
index 49c0bace0..49c0bace0 100644
--- a/data/maps/events/GraniteCave_B2F.s
+++ b/data/maps/events/GraniteCave_B2F.inc
diff --git a/data/maps/events/GraniteCave_StevensRoom.s b/data/maps/events/GraniteCave_StevensRoom.inc
index 2e4d9cd30..2e4d9cd30 100644
--- a/data/maps/events/GraniteCave_StevensRoom.s
+++ b/data/maps/events/GraniteCave_StevensRoom.inc
diff --git a/data/maps/events/InsideOfTruck.s b/data/maps/events/InsideOfTruck.inc
index faf7a5274..faf7a5274 100644
--- a/data/maps/events/InsideOfTruck.s
+++ b/data/maps/events/InsideOfTruck.inc
diff --git a/data/maps/events/IslandCave.s b/data/maps/events/IslandCave.inc
index a3fbc959a..a3fbc959a 100644
--- a/data/maps/events/IslandCave.s
+++ b/data/maps/events/IslandCave.inc
diff --git a/data/maps/events/JaggedPass.s b/data/maps/events/JaggedPass.inc
index 245871e9b..245871e9b 100644
--- a/data/maps/events/JaggedPass.s
+++ b/data/maps/events/JaggedPass.inc
diff --git a/data/maps/events/LavaridgeTown.s b/data/maps/events/LavaridgeTown.inc
index 47dd5ab4a..47dd5ab4a 100644
--- a/data/maps/events/LavaridgeTown.s
+++ b/data/maps/events/LavaridgeTown.inc
diff --git a/data/maps/events/LavaridgeTown_Gym_1F.s b/data/maps/events/LavaridgeTown_Gym_1F.inc
index add699f5d..add699f5d 100644
--- a/data/maps/events/LavaridgeTown_Gym_1F.s
+++ b/data/maps/events/LavaridgeTown_Gym_1F.inc
diff --git a/data/maps/events/LavaridgeTown_Gym_B1F.s b/data/maps/events/LavaridgeTown_Gym_B1F.inc
index 4cff944bc..4cff944bc 100644
--- a/data/maps/events/LavaridgeTown_Gym_B1F.s
+++ b/data/maps/events/LavaridgeTown_Gym_B1F.inc
diff --git a/data/maps/events/LavaridgeTown_HerbShop.s b/data/maps/events/LavaridgeTown_HerbShop.inc
index cb04b19d4..cb04b19d4 100644
--- a/data/maps/events/LavaridgeTown_HerbShop.s
+++ b/data/maps/events/LavaridgeTown_HerbShop.inc
diff --git a/data/maps/events/LavaridgeTown_House.s b/data/maps/events/LavaridgeTown_House.inc
index feb226cd0..feb226cd0 100644
--- a/data/maps/events/LavaridgeTown_House.s
+++ b/data/maps/events/LavaridgeTown_House.inc
diff --git a/data/maps/events/LavaridgeTown_Mart.s b/data/maps/events/LavaridgeTown_Mart.inc
index 8a07501f7..8a07501f7 100644
--- a/data/maps/events/LavaridgeTown_Mart.s
+++ b/data/maps/events/LavaridgeTown_Mart.inc
diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_1F.s b/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc
index dac3d4a72..dac3d4a72 100644
--- a/data/maps/events/LavaridgeTown_PokemonCenter_1F.s
+++ b/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc
diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_2F.s b/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc
index 3ef0517b1..3ef0517b1 100644
--- a/data/maps/events/LavaridgeTown_PokemonCenter_2F.s
+++ b/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc
diff --git a/data/maps/events/LilycoveCity.s b/data/maps/events/LilycoveCity.inc
index a356e2b9e..a356e2b9e 100644
--- a/data/maps/events/LilycoveCity.s
+++ b/data/maps/events/LilycoveCity.inc
diff --git a/data/maps/events/LilycoveCity_ContestHall.s b/data/maps/events/LilycoveCity_ContestHall.inc
index 4246afd33..4246afd33 100644
--- a/data/maps/events/LilycoveCity_ContestHall.s
+++ b/data/maps/events/LilycoveCity_ContestHall.inc
diff --git a/data/maps/events/LilycoveCity_ContestLobby.s b/data/maps/events/LilycoveCity_ContestLobby.inc
index 2e41e6e49..2e41e6e49 100644
--- a/data/maps/events/LilycoveCity_ContestLobby.s
+++ b/data/maps/events/LilycoveCity_ContestLobby.inc
diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.s b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc
index 31bd1c94f..31bd1c94f 100644
--- a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.s
+++ b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc
diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.s b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc
index 2117774f0..2117774f0 100644
--- a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.s
+++ b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc
diff --git a/data/maps/events/LilycoveCity_DepartmentStoreElevator.s b/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc
index 896a96649..896a96649 100644
--- a/data/maps/events/LilycoveCity_DepartmentStoreElevator.s
+++ b/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc
diff --git a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.s b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc
index ac72a87c1..ac72a87c1 100644
--- a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.s
+++ b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_1F.s b/data/maps/events/LilycoveCity_DepartmentStore_1F.inc
index 28bc93a75..28bc93a75 100644
--- a/data/maps/events/LilycoveCity_DepartmentStore_1F.s
+++ b/data/maps/events/LilycoveCity_DepartmentStore_1F.inc
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_2F.s b/data/maps/events/LilycoveCity_DepartmentStore_2F.inc
index fc8872103..fc8872103 100644
--- a/data/maps/events/LilycoveCity_DepartmentStore_2F.s
+++ b/data/maps/events/LilycoveCity_DepartmentStore_2F.inc
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_3F.s b/data/maps/events/LilycoveCity_DepartmentStore_3F.inc
index bf3d1647f..bf3d1647f 100644
--- a/data/maps/events/LilycoveCity_DepartmentStore_3F.s
+++ b/data/maps/events/LilycoveCity_DepartmentStore_3F.inc
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_4F.s b/data/maps/events/LilycoveCity_DepartmentStore_4F.inc
index 007cc8bf4..007cc8bf4 100644
--- a/data/maps/events/LilycoveCity_DepartmentStore_4F.s
+++ b/data/maps/events/LilycoveCity_DepartmentStore_4F.inc
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_5F.s b/data/maps/events/LilycoveCity_DepartmentStore_5F.inc
index 85cf2431f..85cf2431f 100644
--- a/data/maps/events/LilycoveCity_DepartmentStore_5F.s
+++ b/data/maps/events/LilycoveCity_DepartmentStore_5F.inc
diff --git a/data/maps/events/LilycoveCity_EmptyMap.s b/data/maps/events/LilycoveCity_EmptyMap.inc
index 906453882..906453882 100644
--- a/data/maps/events/LilycoveCity_EmptyMap.s
+++ b/data/maps/events/LilycoveCity_EmptyMap.inc
diff --git a/data/maps/events/LilycoveCity_Harbor.s b/data/maps/events/LilycoveCity_Harbor.inc
index 5682ada0e..5682ada0e 100644
--- a/data/maps/events/LilycoveCity_Harbor.s
+++ b/data/maps/events/LilycoveCity_Harbor.inc
diff --git a/data/maps/events/LilycoveCity_House1.s b/data/maps/events/LilycoveCity_House1.inc
index cdae83007..cdae83007 100644
--- a/data/maps/events/LilycoveCity_House1.s
+++ b/data/maps/events/LilycoveCity_House1.inc
diff --git a/data/maps/events/LilycoveCity_House2.s b/data/maps/events/LilycoveCity_House2.inc
index 50b44e253..50b44e253 100644
--- a/data/maps/events/LilycoveCity_House2.s
+++ b/data/maps/events/LilycoveCity_House2.inc
diff --git a/data/maps/events/LilycoveCity_House3.s b/data/maps/events/LilycoveCity_House3.inc
index 43a1068f1..43a1068f1 100644
--- a/data/maps/events/LilycoveCity_House3.s
+++ b/data/maps/events/LilycoveCity_House3.inc
diff --git a/data/maps/events/LilycoveCity_House4.s b/data/maps/events/LilycoveCity_House4.inc
index 88522497d..88522497d 100644
--- a/data/maps/events/LilycoveCity_House4.s
+++ b/data/maps/events/LilycoveCity_House4.inc
diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.s b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc
index 983736d73..983736d73 100644
--- a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.s
+++ b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc
diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.s b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc
index 98c1aa9cd..98c1aa9cd 100644
--- a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.s
+++ b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc
diff --git a/data/maps/events/LilycoveCity_MoveDeletersHouse.s b/data/maps/events/LilycoveCity_MoveDeletersHouse.inc
index 563052712..563052712 100644
--- a/data/maps/events/LilycoveCity_MoveDeletersHouse.s
+++ b/data/maps/events/LilycoveCity_MoveDeletersHouse.inc
diff --git a/data/maps/events/LilycoveCity_PokemonCenter_1F.s b/data/maps/events/LilycoveCity_PokemonCenter_1F.inc
index c33a07b6a..c33a07b6a 100644
--- a/data/maps/events/LilycoveCity_PokemonCenter_1F.s
+++ b/data/maps/events/LilycoveCity_PokemonCenter_1F.inc
diff --git a/data/maps/events/LilycoveCity_PokemonCenter_2F.s b/data/maps/events/LilycoveCity_PokemonCenter_2F.inc
index 736ef1151..736ef1151 100644
--- a/data/maps/events/LilycoveCity_PokemonCenter_2F.s
+++ b/data/maps/events/LilycoveCity_PokemonCenter_2F.inc
diff --git a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.s b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc
index 38007b34f..38007b34f 100644
--- a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.s
+++ b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc
diff --git a/data/maps/events/LilycoveCity_UnusedMart.s b/data/maps/events/LilycoveCity_UnusedMart.inc
index 1eefb6a8f..1eefb6a8f 100644
--- a/data/maps/events/LilycoveCity_UnusedMart.s
+++ b/data/maps/events/LilycoveCity_UnusedMart.inc
diff --git a/data/maps/events/LinkContestRoom1.s b/data/maps/events/LinkContestRoom1.inc
index 6c1e09430..6c1e09430 100644
--- a/data/maps/events/LinkContestRoom1.s
+++ b/data/maps/events/LinkContestRoom1.inc
diff --git a/data/maps/events/LinkContestRoom2.s b/data/maps/events/LinkContestRoom2.inc
index 562a96523..562a96523 100644
--- a/data/maps/events/LinkContestRoom2.s
+++ b/data/maps/events/LinkContestRoom2.inc
diff --git a/data/maps/events/LinkContestRoom3.s b/data/maps/events/LinkContestRoom3.inc
index 8c93f28c9..8c93f28c9 100644
--- a/data/maps/events/LinkContestRoom3.s
+++ b/data/maps/events/LinkContestRoom3.inc
diff --git a/data/maps/events/LinkContestRoom4.s b/data/maps/events/LinkContestRoom4.inc
index a5e455811..a5e455811 100644
--- a/data/maps/events/LinkContestRoom4.s
+++ b/data/maps/events/LinkContestRoom4.inc
diff --git a/data/maps/events/LinkContestRoom5.s b/data/maps/events/LinkContestRoom5.inc
index f0f8fa508..f0f8fa508 100644
--- a/data/maps/events/LinkContestRoom5.s
+++ b/data/maps/events/LinkContestRoom5.inc
diff --git a/data/maps/events/LinkContestRoom6.s b/data/maps/events/LinkContestRoom6.inc
index a8fd4962f..a8fd4962f 100644
--- a/data/maps/events/LinkContestRoom6.s
+++ b/data/maps/events/LinkContestRoom6.inc
diff --git a/data/maps/events/LittlerootTown.s b/data/maps/events/LittlerootTown.inc
index 62a564821..62a564821 100644
--- a/data/maps/events/LittlerootTown.s
+++ b/data/maps/events/LittlerootTown.inc
diff --git a/data/maps/events/LittlerootTown_BrendansHouse_1F.s b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc
index f60a59018..f60a59018 100644
--- a/data/maps/events/LittlerootTown_BrendansHouse_1F.s
+++ b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc
diff --git a/data/maps/events/LittlerootTown_BrendansHouse_2F.s b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc
index a28a2d0d1..a28a2d0d1 100644
--- a/data/maps/events/LittlerootTown_BrendansHouse_2F.s
+++ b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc
diff --git a/data/maps/events/LittlerootTown_MaysHouse_1F.s b/data/maps/events/LittlerootTown_MaysHouse_1F.inc
index d5874624b..d5874624b 100644
--- a/data/maps/events/LittlerootTown_MaysHouse_1F.s
+++ b/data/maps/events/LittlerootTown_MaysHouse_1F.inc
diff --git a/data/maps/events/LittlerootTown_MaysHouse_2F.s b/data/maps/events/LittlerootTown_MaysHouse_2F.inc
index 3a3656287..3a3656287 100644
--- a/data/maps/events/LittlerootTown_MaysHouse_2F.s
+++ b/data/maps/events/LittlerootTown_MaysHouse_2F.inc
diff --git a/data/maps/events/LittlerootTown_ProfessorBirchsLab.s b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc
index cbc1e4154..cbc1e4154 100644
--- a/data/maps/events/LittlerootTown_ProfessorBirchsLab.s
+++ b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc
diff --git a/data/maps/events/MagmaHideout_1F.s b/data/maps/events/MagmaHideout_1F.inc
index b90e53ff8..b90e53ff8 100644
--- a/data/maps/events/MagmaHideout_1F.s
+++ b/data/maps/events/MagmaHideout_1F.inc
diff --git a/data/maps/events/MagmaHideout_B1F.s b/data/maps/events/MagmaHideout_B1F.inc
index c9f1101cc..c9f1101cc 100644
--- a/data/maps/events/MagmaHideout_B1F.s
+++ b/data/maps/events/MagmaHideout_B1F.inc
diff --git a/data/maps/events/MagmaHideout_B2F.s b/data/maps/events/MagmaHideout_B2F.inc
index 258592732..258592732 100644
--- a/data/maps/events/MagmaHideout_B2F.s
+++ b/data/maps/events/MagmaHideout_B2F.inc
diff --git a/data/maps/events/MauvilleCity.s b/data/maps/events/MauvilleCity.inc
index 4d228a92c..4d228a92c 100644
--- a/data/maps/events/MauvilleCity.s
+++ b/data/maps/events/MauvilleCity.inc
diff --git a/data/maps/events/MauvilleCity_BikeShop.s b/data/maps/events/MauvilleCity_BikeShop.inc
index 6c064a1f7..6c064a1f7 100644
--- a/data/maps/events/MauvilleCity_BikeShop.s
+++ b/data/maps/events/MauvilleCity_BikeShop.inc
diff --git a/data/maps/events/MauvilleCity_GameCorner.s b/data/maps/events/MauvilleCity_GameCorner.inc
index ed8549079..ed8549079 100644
--- a/data/maps/events/MauvilleCity_GameCorner.s
+++ b/data/maps/events/MauvilleCity_GameCorner.inc
diff --git a/data/maps/events/MauvilleCity_Gym.s b/data/maps/events/MauvilleCity_Gym.inc
index 4a9ee563f..4a9ee563f 100644
--- a/data/maps/events/MauvilleCity_Gym.s
+++ b/data/maps/events/MauvilleCity_Gym.inc
diff --git a/data/maps/events/MauvilleCity_House1.s b/data/maps/events/MauvilleCity_House1.inc
index 12d6d8cc8..12d6d8cc8 100644
--- a/data/maps/events/MauvilleCity_House1.s
+++ b/data/maps/events/MauvilleCity_House1.inc
diff --git a/data/maps/events/MauvilleCity_House2.s b/data/maps/events/MauvilleCity_House2.inc
index 9feaafe2c..9feaafe2c 100644
--- a/data/maps/events/MauvilleCity_House2.s
+++ b/data/maps/events/MauvilleCity_House2.inc
diff --git a/data/maps/events/MauvilleCity_Mart.s b/data/maps/events/MauvilleCity_Mart.inc
index 05951f578..05951f578 100644
--- a/data/maps/events/MauvilleCity_Mart.s
+++ b/data/maps/events/MauvilleCity_Mart.inc
diff --git a/data/maps/events/MauvilleCity_PokemonCenter_1F.s b/data/maps/events/MauvilleCity_PokemonCenter_1F.inc
index 0f8e80d5c..0f8e80d5c 100644
--- a/data/maps/events/MauvilleCity_PokemonCenter_1F.s
+++ b/data/maps/events/MauvilleCity_PokemonCenter_1F.inc
diff --git a/data/maps/events/MauvilleCity_PokemonCenter_2F.s b/data/maps/events/MauvilleCity_PokemonCenter_2F.inc
index dbd55e499..dbd55e499 100644
--- a/data/maps/events/MauvilleCity_PokemonCenter_2F.s
+++ b/data/maps/events/MauvilleCity_PokemonCenter_2F.inc
diff --git a/data/maps/events/MeteorFalls_1F_1R.s b/data/maps/events/MeteorFalls_1F_1R.inc
index 1178bf543..1178bf543 100644
--- a/data/maps/events/MeteorFalls_1F_1R.s
+++ b/data/maps/events/MeteorFalls_1F_1R.inc
diff --git a/data/maps/events/MeteorFalls_1F_2R.s b/data/maps/events/MeteorFalls_1F_2R.inc
index 549620aa9..549620aa9 100644
--- a/data/maps/events/MeteorFalls_1F_2R.s
+++ b/data/maps/events/MeteorFalls_1F_2R.inc
diff --git a/data/maps/events/MeteorFalls_B1F_1R.s b/data/maps/events/MeteorFalls_B1F_1R.inc
index 796e31cd2..796e31cd2 100644
--- a/data/maps/events/MeteorFalls_B1F_1R.s
+++ b/data/maps/events/MeteorFalls_B1F_1R.inc
diff --git a/data/maps/events/MeteorFalls_B1F_2R.s b/data/maps/events/MeteorFalls_B1F_2R.inc
index abdad1f03..abdad1f03 100644
--- a/data/maps/events/MeteorFalls_B1F_2R.s
+++ b/data/maps/events/MeteorFalls_B1F_2R.inc
diff --git a/data/maps/events/MossdeepCity.s b/data/maps/events/MossdeepCity.inc
index b73bc64f3..b73bc64f3 100644
--- a/data/maps/events/MossdeepCity.s
+++ b/data/maps/events/MossdeepCity.inc
diff --git a/data/maps/events/MossdeepCity_GameCorner_1F.s b/data/maps/events/MossdeepCity_GameCorner_1F.inc
index 99350c4b0..99350c4b0 100644
--- a/data/maps/events/MossdeepCity_GameCorner_1F.s
+++ b/data/maps/events/MossdeepCity_GameCorner_1F.inc
diff --git a/data/maps/events/MossdeepCity_GameCorner_B1F.s b/data/maps/events/MossdeepCity_GameCorner_B1F.inc
index 98c843f52..98c843f52 100644
--- a/data/maps/events/MossdeepCity_GameCorner_B1F.s
+++ b/data/maps/events/MossdeepCity_GameCorner_B1F.inc
diff --git a/data/maps/events/MossdeepCity_Gym.s b/data/maps/events/MossdeepCity_Gym.inc
index d80237a3a..d80237a3a 100644
--- a/data/maps/events/MossdeepCity_Gym.s
+++ b/data/maps/events/MossdeepCity_Gym.inc
diff --git a/data/maps/events/MossdeepCity_House1.s b/data/maps/events/MossdeepCity_House1.inc
index 251440343..251440343 100644
--- a/data/maps/events/MossdeepCity_House1.s
+++ b/data/maps/events/MossdeepCity_House1.inc
diff --git a/data/maps/events/MossdeepCity_House2.s b/data/maps/events/MossdeepCity_House2.inc
index 31ef3ab7b..31ef3ab7b 100644
--- a/data/maps/events/MossdeepCity_House2.s
+++ b/data/maps/events/MossdeepCity_House2.inc
diff --git a/data/maps/events/MossdeepCity_House3.s b/data/maps/events/MossdeepCity_House3.inc
index b1503decc..b1503decc 100644
--- a/data/maps/events/MossdeepCity_House3.s
+++ b/data/maps/events/MossdeepCity_House3.inc
diff --git a/data/maps/events/MossdeepCity_House4.s b/data/maps/events/MossdeepCity_House4.inc
index dc0fdfed8..dc0fdfed8 100644
--- a/data/maps/events/MossdeepCity_House4.s
+++ b/data/maps/events/MossdeepCity_House4.inc
diff --git a/data/maps/events/MossdeepCity_Mart.s b/data/maps/events/MossdeepCity_Mart.inc
index 80514f1f8..80514f1f8 100644
--- a/data/maps/events/MossdeepCity_Mart.s
+++ b/data/maps/events/MossdeepCity_Mart.inc
diff --git a/data/maps/events/MossdeepCity_PokemonCenter_1F.s b/data/maps/events/MossdeepCity_PokemonCenter_1F.inc
index d7cf07f6a..d7cf07f6a 100644
--- a/data/maps/events/MossdeepCity_PokemonCenter_1F.s
+++ b/data/maps/events/MossdeepCity_PokemonCenter_1F.inc
diff --git a/data/maps/events/MossdeepCity_PokemonCenter_2F.s b/data/maps/events/MossdeepCity_PokemonCenter_2F.inc
index 337467351..337467351 100644
--- a/data/maps/events/MossdeepCity_PokemonCenter_2F.s
+++ b/data/maps/events/MossdeepCity_PokemonCenter_2F.inc
diff --git a/data/maps/events/MossdeepCity_SpaceCenter_1F.s b/data/maps/events/MossdeepCity_SpaceCenter_1F.inc
index d79459eb8..d79459eb8 100644
--- a/data/maps/events/MossdeepCity_SpaceCenter_1F.s
+++ b/data/maps/events/MossdeepCity_SpaceCenter_1F.inc
diff --git a/data/maps/events/MossdeepCity_SpaceCenter_2F.s b/data/maps/events/MossdeepCity_SpaceCenter_2F.inc
index 2dc4f843a..2dc4f843a 100644
--- a/data/maps/events/MossdeepCity_SpaceCenter_2F.s
+++ b/data/maps/events/MossdeepCity_SpaceCenter_2F.inc
diff --git a/data/maps/events/MossdeepCity_StevensHouse.s b/data/maps/events/MossdeepCity_StevensHouse.inc
index ce240d81f..ce240d81f 100644
--- a/data/maps/events/MossdeepCity_StevensHouse.s
+++ b/data/maps/events/MossdeepCity_StevensHouse.inc
diff --git a/data/maps/events/MtChimney.s b/data/maps/events/MtChimney.inc
index 468edda1d..468edda1d 100644
--- a/data/maps/events/MtChimney.s
+++ b/data/maps/events/MtChimney.inc
diff --git a/data/maps/events/MtChimney_CableCarStation.s b/data/maps/events/MtChimney_CableCarStation.inc
index db4eef0fa..db4eef0fa 100644
--- a/data/maps/events/MtChimney_CableCarStation.s
+++ b/data/maps/events/MtChimney_CableCarStation.inc
diff --git a/data/maps/events/MtPyre_1F.s b/data/maps/events/MtPyre_1F.inc
index 3f4263f9e..3f4263f9e 100644
--- a/data/maps/events/MtPyre_1F.s
+++ b/data/maps/events/MtPyre_1F.inc
diff --git a/data/maps/events/MtPyre_2F.s b/data/maps/events/MtPyre_2F.inc
index 320be57af..320be57af 100644
--- a/data/maps/events/MtPyre_2F.s
+++ b/data/maps/events/MtPyre_2F.inc
diff --git a/data/maps/events/MtPyre_3F.s b/data/maps/events/MtPyre_3F.inc
index ba5428cb2..ba5428cb2 100644
--- a/data/maps/events/MtPyre_3F.s
+++ b/data/maps/events/MtPyre_3F.inc
diff --git a/data/maps/events/MtPyre_4F.s b/data/maps/events/MtPyre_4F.inc
index c54b36645..c54b36645 100644
--- a/data/maps/events/MtPyre_4F.s
+++ b/data/maps/events/MtPyre_4F.inc
diff --git a/data/maps/events/MtPyre_5F.s b/data/maps/events/MtPyre_5F.inc
index 73b97a40d..73b97a40d 100644
--- a/data/maps/events/MtPyre_5F.s
+++ b/data/maps/events/MtPyre_5F.inc
diff --git a/data/maps/events/MtPyre_6F.s b/data/maps/events/MtPyre_6F.inc
index 70228bc42..70228bc42 100644
--- a/data/maps/events/MtPyre_6F.s
+++ b/data/maps/events/MtPyre_6F.inc
diff --git a/data/maps/events/MtPyre_Exterior.s b/data/maps/events/MtPyre_Exterior.inc
index ac372a2f0..ac372a2f0 100644
--- a/data/maps/events/MtPyre_Exterior.s
+++ b/data/maps/events/MtPyre_Exterior.inc
diff --git a/data/maps/events/MtPyre_Summit.s b/data/maps/events/MtPyre_Summit.inc
index 4f5047765..4f5047765 100644
--- a/data/maps/events/MtPyre_Summit.s
+++ b/data/maps/events/MtPyre_Summit.inc
diff --git a/data/maps/events/NewMauville_Entrance.s b/data/maps/events/NewMauville_Entrance.inc
index 482ff83ca..482ff83ca 100644
--- a/data/maps/events/NewMauville_Entrance.s
+++ b/data/maps/events/NewMauville_Entrance.inc
diff --git a/data/maps/events/NewMauville_Inside.s b/data/maps/events/NewMauville_Inside.inc
index a7384520d..a7384520d 100644
--- a/data/maps/events/NewMauville_Inside.s
+++ b/data/maps/events/NewMauville_Inside.inc
diff --git a/data/maps/events/OldaleTown.s b/data/maps/events/OldaleTown.inc
index a09a08fe2..a09a08fe2 100644
--- a/data/maps/events/OldaleTown.s
+++ b/data/maps/events/OldaleTown.inc
diff --git a/data/maps/events/OldaleTown_House1.s b/data/maps/events/OldaleTown_House1.inc
index 16f29b00e..16f29b00e 100644
--- a/data/maps/events/OldaleTown_House1.s
+++ b/data/maps/events/OldaleTown_House1.inc
diff --git a/data/maps/events/OldaleTown_House2.s b/data/maps/events/OldaleTown_House2.inc
index 904291576..904291576 100644
--- a/data/maps/events/OldaleTown_House2.s
+++ b/data/maps/events/OldaleTown_House2.inc
diff --git a/data/maps/events/OldaleTown_Mart.s b/data/maps/events/OldaleTown_Mart.inc
index a06ece505..a06ece505 100644
--- a/data/maps/events/OldaleTown_Mart.s
+++ b/data/maps/events/OldaleTown_Mart.inc
diff --git a/data/maps/events/OldaleTown_PokemonCenter_1F.s b/data/maps/events/OldaleTown_PokemonCenter_1F.inc
index 161baec86..161baec86 100644
--- a/data/maps/events/OldaleTown_PokemonCenter_1F.s
+++ b/data/maps/events/OldaleTown_PokemonCenter_1F.inc
diff --git a/data/maps/events/OldaleTown_PokemonCenter_2F.s b/data/maps/events/OldaleTown_PokemonCenter_2F.inc
index e2675bb14..e2675bb14 100644
--- a/data/maps/events/OldaleTown_PokemonCenter_2F.s
+++ b/data/maps/events/OldaleTown_PokemonCenter_2F.inc
diff --git a/data/maps/events/PacifidlogTown.s b/data/maps/events/PacifidlogTown.inc
index 1823e9afd..1823e9afd 100644
--- a/data/maps/events/PacifidlogTown.s
+++ b/data/maps/events/PacifidlogTown.inc
diff --git a/data/maps/events/PacifidlogTown_House1.s b/data/maps/events/PacifidlogTown_House1.inc
index 233fa7604..233fa7604 100644
--- a/data/maps/events/PacifidlogTown_House1.s
+++ b/data/maps/events/PacifidlogTown_House1.inc
diff --git a/data/maps/events/PacifidlogTown_House2.s b/data/maps/events/PacifidlogTown_House2.inc
index aa1940d29..aa1940d29 100644
--- a/data/maps/events/PacifidlogTown_House2.s
+++ b/data/maps/events/PacifidlogTown_House2.inc
diff --git a/data/maps/events/PacifidlogTown_House3.s b/data/maps/events/PacifidlogTown_House3.inc
index 80ab8d7f5..80ab8d7f5 100644
--- a/data/maps/events/PacifidlogTown_House3.s
+++ b/data/maps/events/PacifidlogTown_House3.inc
diff --git a/data/maps/events/PacifidlogTown_House4.s b/data/maps/events/PacifidlogTown_House4.inc
index a7dd1469b..a7dd1469b 100644
--- a/data/maps/events/PacifidlogTown_House4.s
+++ b/data/maps/events/PacifidlogTown_House4.inc
diff --git a/data/maps/events/PacifidlogTown_House5.s b/data/maps/events/PacifidlogTown_House5.inc
index 963a319cf..963a319cf 100644
--- a/data/maps/events/PacifidlogTown_House5.s
+++ b/data/maps/events/PacifidlogTown_House5.inc
diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_1F.s b/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc
index 432ba616d..432ba616d 100644
--- a/data/maps/events/PacifidlogTown_PokemonCenter_1F.s
+++ b/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc
diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_2F.s b/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc
index f4110623f..f4110623f 100644
--- a/data/maps/events/PacifidlogTown_PokemonCenter_2F.s
+++ b/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc
diff --git a/data/maps/events/PetalburgCity.s b/data/maps/events/PetalburgCity.inc
index 4c36c49ab..4c36c49ab 100644
--- a/data/maps/events/PetalburgCity.s
+++ b/data/maps/events/PetalburgCity.inc
diff --git a/data/maps/events/PetalburgCity_Gym.s b/data/maps/events/PetalburgCity_Gym.inc
index 47205e253..47205e253 100644
--- a/data/maps/events/PetalburgCity_Gym.s
+++ b/data/maps/events/PetalburgCity_Gym.inc
diff --git a/data/maps/events/PetalburgCity_House1.s b/data/maps/events/PetalburgCity_House1.inc
index 2d6a28056..2d6a28056 100644
--- a/data/maps/events/PetalburgCity_House1.s
+++ b/data/maps/events/PetalburgCity_House1.inc
diff --git a/data/maps/events/PetalburgCity_House2.s b/data/maps/events/PetalburgCity_House2.inc
index 0797b9bab..0797b9bab 100644
--- a/data/maps/events/PetalburgCity_House2.s
+++ b/data/maps/events/PetalburgCity_House2.inc
diff --git a/data/maps/events/PetalburgCity_Mart.s b/data/maps/events/PetalburgCity_Mart.inc
index 2fbed4b9d..2fbed4b9d 100644
--- a/data/maps/events/PetalburgCity_Mart.s
+++ b/data/maps/events/PetalburgCity_Mart.inc
diff --git a/data/maps/events/PetalburgCity_PokemonCenter_1F.s b/data/maps/events/PetalburgCity_PokemonCenter_1F.inc
index 5fb3186e5..5fb3186e5 100644
--- a/data/maps/events/PetalburgCity_PokemonCenter_1F.s
+++ b/data/maps/events/PetalburgCity_PokemonCenter_1F.inc
diff --git a/data/maps/events/PetalburgCity_PokemonCenter_2F.s b/data/maps/events/PetalburgCity_PokemonCenter_2F.inc
index eab3d7dd5..eab3d7dd5 100644
--- a/data/maps/events/PetalburgCity_PokemonCenter_2F.s
+++ b/data/maps/events/PetalburgCity_PokemonCenter_2F.inc
diff --git a/data/maps/events/PetalburgCity_WallysHouse.s b/data/maps/events/PetalburgCity_WallysHouse.inc
index 724b84f0f..724b84f0f 100644
--- a/data/maps/events/PetalburgCity_WallysHouse.s
+++ b/data/maps/events/PetalburgCity_WallysHouse.inc
diff --git a/data/maps/events/PetalburgWoods.s b/data/maps/events/PetalburgWoods.inc
index 0ec69c1a2..0ec69c1a2 100644
--- a/data/maps/events/PetalburgWoods.s
+++ b/data/maps/events/PetalburgWoods.inc
diff --git a/data/maps/events/RecordCorner.s b/data/maps/events/RecordCorner.inc
index 7062f61ea..7062f61ea 100644
--- a/data/maps/events/RecordCorner.s
+++ b/data/maps/events/RecordCorner.inc
diff --git a/data/maps/events/Route101.s b/data/maps/events/Route101.inc
index bad4e3ba9..bad4e3ba9 100644
--- a/data/maps/events/Route101.s
+++ b/data/maps/events/Route101.inc
diff --git a/data/maps/events/Route102.s b/data/maps/events/Route102.inc
index 9cf97de4b..9cf97de4b 100644
--- a/data/maps/events/Route102.s
+++ b/data/maps/events/Route102.inc
diff --git a/data/maps/events/Route103.s b/data/maps/events/Route103.inc
index 01640eb65..01640eb65 100644
--- a/data/maps/events/Route103.s
+++ b/data/maps/events/Route103.inc
diff --git a/data/maps/events/Route104.s b/data/maps/events/Route104.inc
index da4b5ffc1..da4b5ffc1 100644
--- a/data/maps/events/Route104.s
+++ b/data/maps/events/Route104.inc
diff --git a/data/maps/events/Route104_MrBrineysHouse.s b/data/maps/events/Route104_MrBrineysHouse.inc
index d8b2ff252..d8b2ff252 100644
--- a/data/maps/events/Route104_MrBrineysHouse.s
+++ b/data/maps/events/Route104_MrBrineysHouse.inc
diff --git a/data/maps/events/Route104_PrettyPetalFlowerShop.s b/data/maps/events/Route104_PrettyPetalFlowerShop.inc
index 0c540e940..0c540e940 100644
--- a/data/maps/events/Route104_PrettyPetalFlowerShop.s
+++ b/data/maps/events/Route104_PrettyPetalFlowerShop.inc
diff --git a/data/maps/events/Route104_Prototype.s b/data/maps/events/Route104_Prototype.inc
index 6748fe0ed..6748fe0ed 100644
--- a/data/maps/events/Route104_Prototype.s
+++ b/data/maps/events/Route104_Prototype.inc
diff --git a/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.s b/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc
index 96cac1e71..96cac1e71 100644
--- a/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.s
+++ b/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc
diff --git a/data/maps/events/Route105.s b/data/maps/events/Route105.inc
index 5f7f6c13d..5f7f6c13d 100644
--- a/data/maps/events/Route105.s
+++ b/data/maps/events/Route105.inc
diff --git a/data/maps/events/Route106.s b/data/maps/events/Route106.inc
index 51c093fe5..51c093fe5 100644
--- a/data/maps/events/Route106.s
+++ b/data/maps/events/Route106.inc
diff --git a/data/maps/events/Route107.s b/data/maps/events/Route107.inc
index 363414c2f..363414c2f 100644
--- a/data/maps/events/Route107.s
+++ b/data/maps/events/Route107.inc
diff --git a/data/maps/events/Route108.s b/data/maps/events/Route108.inc
index 1f49a1e0c..1f49a1e0c 100644
--- a/data/maps/events/Route108.s
+++ b/data/maps/events/Route108.inc
diff --git a/data/maps/events/Route109.s b/data/maps/events/Route109.inc
index 511579650..511579650 100644
--- a/data/maps/events/Route109.s
+++ b/data/maps/events/Route109.inc
diff --git a/data/maps/events/Route109_SeashoreHouse.s b/data/maps/events/Route109_SeashoreHouse.inc
index 5036df1e7..5036df1e7 100644
--- a/data/maps/events/Route109_SeashoreHouse.s
+++ b/data/maps/events/Route109_SeashoreHouse.inc
diff --git a/data/maps/events/Route110.s b/data/maps/events/Route110.inc
index 4ece25549..4ece25549 100644
--- a/data/maps/events/Route110.s
+++ b/data/maps/events/Route110.inc
diff --git a/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.s b/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc
index e1ca6b4de..e1ca6b4de 100644
--- a/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.s
+++ b/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc
diff --git a/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.s b/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc
index 24ae3600f..24ae3600f 100644
--- a/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.s
+++ b/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc
diff --git a/data/maps/events/Route110_TrickHouseCorridor.s b/data/maps/events/Route110_TrickHouseCorridor.inc
index 105701e55..105701e55 100644
--- a/data/maps/events/Route110_TrickHouseCorridor.s
+++ b/data/maps/events/Route110_TrickHouseCorridor.inc
diff --git a/data/maps/events/Route110_TrickHouseEnd.s b/data/maps/events/Route110_TrickHouseEnd.inc
index f050e3270..f050e3270 100644
--- a/data/maps/events/Route110_TrickHouseEnd.s
+++ b/data/maps/events/Route110_TrickHouseEnd.inc
diff --git a/data/maps/events/Route110_TrickHouseEntrance.s b/data/maps/events/Route110_TrickHouseEntrance.inc
index a1f67bd3d..a1f67bd3d 100644
--- a/data/maps/events/Route110_TrickHouseEntrance.s
+++ b/data/maps/events/Route110_TrickHouseEntrance.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle1.s b/data/maps/events/Route110_TrickHousePuzzle1.inc
index 7e282f0e8..7e282f0e8 100644
--- a/data/maps/events/Route110_TrickHousePuzzle1.s
+++ b/data/maps/events/Route110_TrickHousePuzzle1.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle2.s b/data/maps/events/Route110_TrickHousePuzzle2.inc
index d77fd66a1..d77fd66a1 100644
--- a/data/maps/events/Route110_TrickHousePuzzle2.s
+++ b/data/maps/events/Route110_TrickHousePuzzle2.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle3.s b/data/maps/events/Route110_TrickHousePuzzle3.inc
index b7a902a54..b7a902a54 100644
--- a/data/maps/events/Route110_TrickHousePuzzle3.s
+++ b/data/maps/events/Route110_TrickHousePuzzle3.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle4.s b/data/maps/events/Route110_TrickHousePuzzle4.inc
index ac3e152a2..ac3e152a2 100644
--- a/data/maps/events/Route110_TrickHousePuzzle4.s
+++ b/data/maps/events/Route110_TrickHousePuzzle4.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle5.s b/data/maps/events/Route110_TrickHousePuzzle5.inc
index be38ef452..be38ef452 100644
--- a/data/maps/events/Route110_TrickHousePuzzle5.s
+++ b/data/maps/events/Route110_TrickHousePuzzle5.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle6.s b/data/maps/events/Route110_TrickHousePuzzle6.inc
index 1e6c7869b..1e6c7869b 100644
--- a/data/maps/events/Route110_TrickHousePuzzle6.s
+++ b/data/maps/events/Route110_TrickHousePuzzle6.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle7.s b/data/maps/events/Route110_TrickHousePuzzle7.inc
index d5e4f14af..d5e4f14af 100644
--- a/data/maps/events/Route110_TrickHousePuzzle7.s
+++ b/data/maps/events/Route110_TrickHousePuzzle7.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle8.s b/data/maps/events/Route110_TrickHousePuzzle8.inc
index accb0b3a2..accb0b3a2 100644
--- a/data/maps/events/Route110_TrickHousePuzzle8.s
+++ b/data/maps/events/Route110_TrickHousePuzzle8.inc
diff --git a/data/maps/events/Route111.s b/data/maps/events/Route111.inc
index 9eeed5ede..9eeed5ede 100644
--- a/data/maps/events/Route111.s
+++ b/data/maps/events/Route111.inc
diff --git a/data/maps/events/Route111_OldLadysRestStop.s b/data/maps/events/Route111_OldLadysRestStop.inc
index c295aa0c9..c295aa0c9 100644
--- a/data/maps/events/Route111_OldLadysRestStop.s
+++ b/data/maps/events/Route111_OldLadysRestStop.inc
diff --git a/data/maps/events/Route111_WinstrateFamilysHouse.s b/data/maps/events/Route111_WinstrateFamilysHouse.inc
index 8cb265965..8cb265965 100644
--- a/data/maps/events/Route111_WinstrateFamilysHouse.s
+++ b/data/maps/events/Route111_WinstrateFamilysHouse.inc
diff --git a/data/maps/events/Route112.s b/data/maps/events/Route112.inc
index f6dfcfbe5..f6dfcfbe5 100644
--- a/data/maps/events/Route112.s
+++ b/data/maps/events/Route112.inc
diff --git a/data/maps/events/Route112_CableCarStation.s b/data/maps/events/Route112_CableCarStation.inc
index 6ca18059b..6ca18059b 100644
--- a/data/maps/events/Route112_CableCarStation.s
+++ b/data/maps/events/Route112_CableCarStation.inc
diff --git a/data/maps/events/Route113.s b/data/maps/events/Route113.inc
index ee145eb76..ee145eb76 100644
--- a/data/maps/events/Route113.s
+++ b/data/maps/events/Route113.inc
diff --git a/data/maps/events/Route113_GlassWorkshop.s b/data/maps/events/Route113_GlassWorkshop.inc
index 68b47709d..68b47709d 100644
--- a/data/maps/events/Route113_GlassWorkshop.s
+++ b/data/maps/events/Route113_GlassWorkshop.inc
diff --git a/data/maps/events/Route114.s b/data/maps/events/Route114.inc
index a2d948d33..a2d948d33 100644
--- a/data/maps/events/Route114.s
+++ b/data/maps/events/Route114.inc
diff --git a/data/maps/events/Route114_FossilManiacsHouse.s b/data/maps/events/Route114_FossilManiacsHouse.inc
index f7bf465e9..f7bf465e9 100644
--- a/data/maps/events/Route114_FossilManiacsHouse.s
+++ b/data/maps/events/Route114_FossilManiacsHouse.inc
diff --git a/data/maps/events/Route114_FossilManiacsTunnel.s b/data/maps/events/Route114_FossilManiacsTunnel.inc
index 89c231d7e..89c231d7e 100644
--- a/data/maps/events/Route114_FossilManiacsTunnel.s
+++ b/data/maps/events/Route114_FossilManiacsTunnel.inc
diff --git a/data/maps/events/Route114_LanettesHouse.s b/data/maps/events/Route114_LanettesHouse.inc
index e62f6e0ad..e62f6e0ad 100644
--- a/data/maps/events/Route114_LanettesHouse.s
+++ b/data/maps/events/Route114_LanettesHouse.inc
diff --git a/data/maps/events/Route115.s b/data/maps/events/Route115.inc
index cba3c3e7d..cba3c3e7d 100644
--- a/data/maps/events/Route115.s
+++ b/data/maps/events/Route115.inc
diff --git a/data/maps/events/Route116.s b/data/maps/events/Route116.inc
index 18717be4e..18717be4e 100644
--- a/data/maps/events/Route116.s
+++ b/data/maps/events/Route116.inc
diff --git a/data/maps/events/Route116_TunnelersRestHouse.s b/data/maps/events/Route116_TunnelersRestHouse.inc
index 4e4553567..4e4553567 100644
--- a/data/maps/events/Route116_TunnelersRestHouse.s
+++ b/data/maps/events/Route116_TunnelersRestHouse.inc
diff --git a/data/maps/events/Route117.s b/data/maps/events/Route117.inc
index b53e3de57..b53e3de57 100644
--- a/data/maps/events/Route117.s
+++ b/data/maps/events/Route117.inc
diff --git a/data/maps/events/Route117_PokemonDayCare.s b/data/maps/events/Route117_PokemonDayCare.inc
index 69ede9610..69ede9610 100644
--- a/data/maps/events/Route117_PokemonDayCare.s
+++ b/data/maps/events/Route117_PokemonDayCare.inc
diff --git a/data/maps/events/Route118.s b/data/maps/events/Route118.inc
index f912b6fbd..f912b6fbd 100644
--- a/data/maps/events/Route118.s
+++ b/data/maps/events/Route118.inc
diff --git a/data/maps/events/Route119.s b/data/maps/events/Route119.inc
index 966ae6058..966ae6058 100644
--- a/data/maps/events/Route119.s
+++ b/data/maps/events/Route119.inc
diff --git a/data/maps/events/Route119_House.s b/data/maps/events/Route119_House.inc
index 45267ca0e..45267ca0e 100644
--- a/data/maps/events/Route119_House.s
+++ b/data/maps/events/Route119_House.inc
diff --git a/data/maps/events/Route119_WeatherInstitute_1F.s b/data/maps/events/Route119_WeatherInstitute_1F.inc
index 1472fb569..1472fb569 100644
--- a/data/maps/events/Route119_WeatherInstitute_1F.s
+++ b/data/maps/events/Route119_WeatherInstitute_1F.inc
diff --git a/data/maps/events/Route119_WeatherInstitute_2F.s b/data/maps/events/Route119_WeatherInstitute_2F.inc
index d2dbce24d..d2dbce24d 100644
--- a/data/maps/events/Route119_WeatherInstitute_2F.s
+++ b/data/maps/events/Route119_WeatherInstitute_2F.inc
diff --git a/data/maps/events/Route120.s b/data/maps/events/Route120.inc
index 43a67ee99..43a67ee99 100644
--- a/data/maps/events/Route120.s
+++ b/data/maps/events/Route120.inc
diff --git a/data/maps/events/Route121.s b/data/maps/events/Route121.inc
index 514f51349..514f51349 100644
--- a/data/maps/events/Route121.s
+++ b/data/maps/events/Route121.inc
diff --git a/data/maps/events/Route121_SafariZoneEntrance.s b/data/maps/events/Route121_SafariZoneEntrance.inc
index c3880d4b3..c3880d4b3 100644
--- a/data/maps/events/Route121_SafariZoneEntrance.s
+++ b/data/maps/events/Route121_SafariZoneEntrance.inc
diff --git a/data/maps/events/Route122.s b/data/maps/events/Route122.inc
index 217c28ee1..217c28ee1 100644
--- a/data/maps/events/Route122.s
+++ b/data/maps/events/Route122.inc
diff --git a/data/maps/events/Route123.s b/data/maps/events/Route123.inc
index 6b97bafe5..6b97bafe5 100644
--- a/data/maps/events/Route123.s
+++ b/data/maps/events/Route123.inc
diff --git a/data/maps/events/Route123_BerryMastersHouse.s b/data/maps/events/Route123_BerryMastersHouse.inc
index 183e19415..183e19415 100644
--- a/data/maps/events/Route123_BerryMastersHouse.s
+++ b/data/maps/events/Route123_BerryMastersHouse.inc
diff --git a/data/maps/events/Route124.s b/data/maps/events/Route124.inc
index 83db7f24b..83db7f24b 100644
--- a/data/maps/events/Route124.s
+++ b/data/maps/events/Route124.inc
diff --git a/data/maps/events/Route125.s b/data/maps/events/Route125.inc
index 0c7d12643..0c7d12643 100644
--- a/data/maps/events/Route125.s
+++ b/data/maps/events/Route125.inc
diff --git a/data/maps/events/Route126.s b/data/maps/events/Route126.inc
index 50d1dca52..50d1dca52 100644
--- a/data/maps/events/Route126.s
+++ b/data/maps/events/Route126.inc
diff --git a/data/maps/events/Route127.s b/data/maps/events/Route127.inc
index b3744194e..b3744194e 100644
--- a/data/maps/events/Route127.s
+++ b/data/maps/events/Route127.inc
diff --git a/data/maps/events/Route128.s b/data/maps/events/Route128.inc
index 74f99d02c..74f99d02c 100644
--- a/data/maps/events/Route128.s
+++ b/data/maps/events/Route128.inc
diff --git a/data/maps/events/Route129.s b/data/maps/events/Route129.inc
index 10716b557..10716b557 100644
--- a/data/maps/events/Route129.s
+++ b/data/maps/events/Route129.inc
diff --git a/data/maps/events/Route130.s b/data/maps/events/Route130.inc
index f2c72ef2d..f2c72ef2d 100644
--- a/data/maps/events/Route130.s
+++ b/data/maps/events/Route130.inc
diff --git a/data/maps/events/Route131.s b/data/maps/events/Route131.inc
index ed1a33768..ed1a33768 100644
--- a/data/maps/events/Route131.s
+++ b/data/maps/events/Route131.inc
diff --git a/data/maps/events/Route132.s b/data/maps/events/Route132.inc
index b19e96363..b19e96363 100644
--- a/data/maps/events/Route132.s
+++ b/data/maps/events/Route132.inc
diff --git a/data/maps/events/Route133.s b/data/maps/events/Route133.inc
index 1461293e8..1461293e8 100644
--- a/data/maps/events/Route133.s
+++ b/data/maps/events/Route133.inc
diff --git a/data/maps/events/Route134.s b/data/maps/events/Route134.inc
index a8d2eb030..a8d2eb030 100644
--- a/data/maps/events/Route134.s
+++ b/data/maps/events/Route134.inc
diff --git a/data/maps/events/RustboroCity.s b/data/maps/events/RustboroCity.inc
index 4bbf0a6a2..4bbf0a6a2 100644
--- a/data/maps/events/RustboroCity.s
+++ b/data/maps/events/RustboroCity.inc
diff --git a/data/maps/events/RustboroCity_CuttersHouse.s b/data/maps/events/RustboroCity_CuttersHouse.inc
index b38fc9afe..b38fc9afe 100644
--- a/data/maps/events/RustboroCity_CuttersHouse.s
+++ b/data/maps/events/RustboroCity_CuttersHouse.inc
diff --git a/data/maps/events/RustboroCity_DevonCorp_1F.s b/data/maps/events/RustboroCity_DevonCorp_1F.inc
index 72437229c..72437229c 100644
--- a/data/maps/events/RustboroCity_DevonCorp_1F.s
+++ b/data/maps/events/RustboroCity_DevonCorp_1F.inc
diff --git a/data/maps/events/RustboroCity_DevonCorp_2F.s b/data/maps/events/RustboroCity_DevonCorp_2F.inc
index 3ca57bf10..3ca57bf10 100644
--- a/data/maps/events/RustboroCity_DevonCorp_2F.s
+++ b/data/maps/events/RustboroCity_DevonCorp_2F.inc
diff --git a/data/maps/events/RustboroCity_DevonCorp_3F.s b/data/maps/events/RustboroCity_DevonCorp_3F.inc
index f0f8fadec..f0f8fadec 100644
--- a/data/maps/events/RustboroCity_DevonCorp_3F.s
+++ b/data/maps/events/RustboroCity_DevonCorp_3F.inc
diff --git a/data/maps/events/RustboroCity_Flat1_1F.s b/data/maps/events/RustboroCity_Flat1_1F.inc
index 9c637f0fb..9c637f0fb 100644
--- a/data/maps/events/RustboroCity_Flat1_1F.s
+++ b/data/maps/events/RustboroCity_Flat1_1F.inc
diff --git a/data/maps/events/RustboroCity_Flat1_2F.s b/data/maps/events/RustboroCity_Flat1_2F.inc
index 2d1d187e9..2d1d187e9 100644
--- a/data/maps/events/RustboroCity_Flat1_2F.s
+++ b/data/maps/events/RustboroCity_Flat1_2F.inc
diff --git a/data/maps/events/RustboroCity_Flat2_1F.s b/data/maps/events/RustboroCity_Flat2_1F.inc
index bd9f4904e..bd9f4904e 100644
--- a/data/maps/events/RustboroCity_Flat2_1F.s
+++ b/data/maps/events/RustboroCity_Flat2_1F.inc
diff --git a/data/maps/events/RustboroCity_Flat2_2F.s b/data/maps/events/RustboroCity_Flat2_2F.inc
index 988e3797d..988e3797d 100644
--- a/data/maps/events/RustboroCity_Flat2_2F.s
+++ b/data/maps/events/RustboroCity_Flat2_2F.inc
diff --git a/data/maps/events/RustboroCity_Flat2_3F.s b/data/maps/events/RustboroCity_Flat2_3F.inc
index 3c09ce553..3c09ce553 100644
--- a/data/maps/events/RustboroCity_Flat2_3F.s
+++ b/data/maps/events/RustboroCity_Flat2_3F.inc
diff --git a/data/maps/events/RustboroCity_Gym.s b/data/maps/events/RustboroCity_Gym.inc
index cfe9f420d..cfe9f420d 100644
--- a/data/maps/events/RustboroCity_Gym.s
+++ b/data/maps/events/RustboroCity_Gym.inc
diff --git a/data/maps/events/RustboroCity_House1.s b/data/maps/events/RustboroCity_House1.inc
index 8e1cb1c7e..8e1cb1c7e 100644
--- a/data/maps/events/RustboroCity_House1.s
+++ b/data/maps/events/RustboroCity_House1.inc
diff --git a/data/maps/events/RustboroCity_House2.s b/data/maps/events/RustboroCity_House2.inc
index 33159faa4..33159faa4 100644
--- a/data/maps/events/RustboroCity_House2.s
+++ b/data/maps/events/RustboroCity_House2.inc
diff --git a/data/maps/events/RustboroCity_House3.s b/data/maps/events/RustboroCity_House3.inc
index 696350f00..696350f00 100644
--- a/data/maps/events/RustboroCity_House3.s
+++ b/data/maps/events/RustboroCity_House3.inc
diff --git a/data/maps/events/RustboroCity_Mart.s b/data/maps/events/RustboroCity_Mart.inc
index 3949dcd2e..3949dcd2e 100644
--- a/data/maps/events/RustboroCity_Mart.s
+++ b/data/maps/events/RustboroCity_Mart.inc
diff --git a/data/maps/events/RustboroCity_PokemonCenter_1F.s b/data/maps/events/RustboroCity_PokemonCenter_1F.inc
index a0e7a3f76..a0e7a3f76 100644
--- a/data/maps/events/RustboroCity_PokemonCenter_1F.s
+++ b/data/maps/events/RustboroCity_PokemonCenter_1F.inc
diff --git a/data/maps/events/RustboroCity_PokemonCenter_2F.s b/data/maps/events/RustboroCity_PokemonCenter_2F.inc
index c75817126..c75817126 100644
--- a/data/maps/events/RustboroCity_PokemonCenter_2F.s
+++ b/data/maps/events/RustboroCity_PokemonCenter_2F.inc
diff --git a/data/maps/events/RustboroCity_PokemonSchool.s b/data/maps/events/RustboroCity_PokemonSchool.inc
index 5ae481bad..5ae481bad 100644
--- a/data/maps/events/RustboroCity_PokemonSchool.s
+++ b/data/maps/events/RustboroCity_PokemonSchool.inc
diff --git a/data/maps/events/RusturfTunnel.s b/data/maps/events/RusturfTunnel.inc
index 490afda7b..490afda7b 100644
--- a/data/maps/events/RusturfTunnel.s
+++ b/data/maps/events/RusturfTunnel.inc
diff --git a/data/maps/events/SSTidalCorridor.s b/data/maps/events/SSTidalCorridor.inc
index b7eb1eb8f..b7eb1eb8f 100644
--- a/data/maps/events/SSTidalCorridor.s
+++ b/data/maps/events/SSTidalCorridor.inc
diff --git a/data/maps/events/SSTidalLowerDeck.s b/data/maps/events/SSTidalLowerDeck.inc
index 6e8530c36..6e8530c36 100644
--- a/data/maps/events/SSTidalLowerDeck.s
+++ b/data/maps/events/SSTidalLowerDeck.inc
diff --git a/data/maps/events/SSTidalRooms.s b/data/maps/events/SSTidalRooms.inc
index 0ffe1cbe7..0ffe1cbe7 100644
--- a/data/maps/events/SSTidalRooms.s
+++ b/data/maps/events/SSTidalRooms.inc
diff --git a/data/maps/events/SafariZone_Northeast.s b/data/maps/events/SafariZone_Northeast.inc
index 30921f095..30921f095 100644
--- a/data/maps/events/SafariZone_Northeast.s
+++ b/data/maps/events/SafariZone_Northeast.inc
diff --git a/data/maps/events/SafariZone_Northwest.s b/data/maps/events/SafariZone_Northwest.inc
index 0a1846b29..0a1846b29 100644
--- a/data/maps/events/SafariZone_Northwest.s
+++ b/data/maps/events/SafariZone_Northwest.inc
diff --git a/data/maps/events/SafariZone_RestHouse.s b/data/maps/events/SafariZone_RestHouse.inc
index d6de3f747..d6de3f747 100644
--- a/data/maps/events/SafariZone_RestHouse.s
+++ b/data/maps/events/SafariZone_RestHouse.inc
diff --git a/data/maps/events/SafariZone_Southeast.s b/data/maps/events/SafariZone_Southeast.inc
index d67f018ab..d67f018ab 100644
--- a/data/maps/events/SafariZone_Southeast.s
+++ b/data/maps/events/SafariZone_Southeast.inc
diff --git a/data/maps/events/SafariZone_Southwest.s b/data/maps/events/SafariZone_Southwest.inc
index 4f7f21de5..4f7f21de5 100644
--- a/data/maps/events/SafariZone_Southwest.s
+++ b/data/maps/events/SafariZone_Southwest.inc
diff --git a/data/maps/events/ScorchedSlab.s b/data/maps/events/ScorchedSlab.inc
index 4b6625b52..4b6625b52 100644
--- a/data/maps/events/ScorchedSlab.s
+++ b/data/maps/events/ScorchedSlab.inc
diff --git a/data/maps/events/SeafloorCavern_Entrance.s b/data/maps/events/SeafloorCavern_Entrance.inc
index a7f08532c..a7f08532c 100644
--- a/data/maps/events/SeafloorCavern_Entrance.s
+++ b/data/maps/events/SeafloorCavern_Entrance.inc
diff --git a/data/maps/events/SeafloorCavern_Room1.s b/data/maps/events/SeafloorCavern_Room1.inc
index 1e791f884..1e791f884 100644
--- a/data/maps/events/SeafloorCavern_Room1.s
+++ b/data/maps/events/SeafloorCavern_Room1.inc
diff --git a/data/maps/events/SeafloorCavern_Room2.s b/data/maps/events/SeafloorCavern_Room2.inc
index 3dbe5e8a7..3dbe5e8a7 100644
--- a/data/maps/events/SeafloorCavern_Room2.s
+++ b/data/maps/events/SeafloorCavern_Room2.inc
diff --git a/data/maps/events/SeafloorCavern_Room3.s b/data/maps/events/SeafloorCavern_Room3.inc
index 98e6066f2..98e6066f2 100644
--- a/data/maps/events/SeafloorCavern_Room3.s
+++ b/data/maps/events/SeafloorCavern_Room3.inc
diff --git a/data/maps/events/SeafloorCavern_Room4.s b/data/maps/events/SeafloorCavern_Room4.inc
index 3233123b3..3233123b3 100644
--- a/data/maps/events/SeafloorCavern_Room4.s
+++ b/data/maps/events/SeafloorCavern_Room4.inc
diff --git a/data/maps/events/SeafloorCavern_Room5.s b/data/maps/events/SeafloorCavern_Room5.inc
index 0ebd46a56..0ebd46a56 100644
--- a/data/maps/events/SeafloorCavern_Room5.s
+++ b/data/maps/events/SeafloorCavern_Room5.inc
diff --git a/data/maps/events/SeafloorCavern_Room6.s b/data/maps/events/SeafloorCavern_Room6.inc
index 9055af75b..9055af75b 100644
--- a/data/maps/events/SeafloorCavern_Room6.s
+++ b/data/maps/events/SeafloorCavern_Room6.inc
diff --git a/data/maps/events/SeafloorCavern_Room7.s b/data/maps/events/SeafloorCavern_Room7.inc
index 7125027fd..7125027fd 100644
--- a/data/maps/events/SeafloorCavern_Room7.s
+++ b/data/maps/events/SeafloorCavern_Room7.inc
diff --git a/data/maps/events/SeafloorCavern_Room8.s b/data/maps/events/SeafloorCavern_Room8.inc
index 610937753..610937753 100644
--- a/data/maps/events/SeafloorCavern_Room8.s
+++ b/data/maps/events/SeafloorCavern_Room8.inc
diff --git a/data/maps/events/SeafloorCavern_Room9.s b/data/maps/events/SeafloorCavern_Room9.inc
index 2fccd4fec..2fccd4fec 100644
--- a/data/maps/events/SeafloorCavern_Room9.s
+++ b/data/maps/events/SeafloorCavern_Room9.inc
diff --git a/data/maps/events/SealedChamber_InnerRoom.s b/data/maps/events/SealedChamber_InnerRoom.inc
index 260de2dd9..260de2dd9 100644
--- a/data/maps/events/SealedChamber_InnerRoom.s
+++ b/data/maps/events/SealedChamber_InnerRoom.inc
diff --git a/data/maps/events/SealedChamber_OuterRoom.s b/data/maps/events/SealedChamber_OuterRoom.inc
index 5251d401a..5251d401a 100644
--- a/data/maps/events/SealedChamber_OuterRoom.s
+++ b/data/maps/events/SealedChamber_OuterRoom.inc
diff --git a/data/maps/events/SecretBase_BlueCave1.s b/data/maps/events/SecretBase_BlueCave1.inc
index 25bab40da..25bab40da 100644
--- a/data/maps/events/SecretBase_BlueCave1.s
+++ b/data/maps/events/SecretBase_BlueCave1.inc
diff --git a/data/maps/events/SecretBase_BlueCave2.s b/data/maps/events/SecretBase_BlueCave2.inc
index a7eac24a4..a7eac24a4 100644
--- a/data/maps/events/SecretBase_BlueCave2.s
+++ b/data/maps/events/SecretBase_BlueCave2.inc
diff --git a/data/maps/events/SecretBase_BlueCave3.s b/data/maps/events/SecretBase_BlueCave3.inc
index 202c2bc4e..202c2bc4e 100644
--- a/data/maps/events/SecretBase_BlueCave3.s
+++ b/data/maps/events/SecretBase_BlueCave3.inc
diff --git a/data/maps/events/SecretBase_BlueCave4.s b/data/maps/events/SecretBase_BlueCave4.inc
index 2975c0b37..2975c0b37 100644
--- a/data/maps/events/SecretBase_BlueCave4.s
+++ b/data/maps/events/SecretBase_BlueCave4.inc
diff --git a/data/maps/events/SecretBase_BrownCave1.s b/data/maps/events/SecretBase_BrownCave1.inc
index 31e2d0117..31e2d0117 100644
--- a/data/maps/events/SecretBase_BrownCave1.s
+++ b/data/maps/events/SecretBase_BrownCave1.inc
diff --git a/data/maps/events/SecretBase_BrownCave2.s b/data/maps/events/SecretBase_BrownCave2.inc
index 93f9a3c03..93f9a3c03 100644
--- a/data/maps/events/SecretBase_BrownCave2.s
+++ b/data/maps/events/SecretBase_BrownCave2.inc
diff --git a/data/maps/events/SecretBase_BrownCave3.s b/data/maps/events/SecretBase_BrownCave3.inc
index 5aa5aed7a..5aa5aed7a 100644
--- a/data/maps/events/SecretBase_BrownCave3.s
+++ b/data/maps/events/SecretBase_BrownCave3.inc
diff --git a/data/maps/events/SecretBase_BrownCave4.s b/data/maps/events/SecretBase_BrownCave4.inc
index fc66e8fb5..fc66e8fb5 100644
--- a/data/maps/events/SecretBase_BrownCave4.s
+++ b/data/maps/events/SecretBase_BrownCave4.inc
diff --git a/data/maps/events/SecretBase_RedCave1.s b/data/maps/events/SecretBase_RedCave1.inc
index dbc8c7593..dbc8c7593 100644
--- a/data/maps/events/SecretBase_RedCave1.s
+++ b/data/maps/events/SecretBase_RedCave1.inc
diff --git a/data/maps/events/SecretBase_RedCave2.s b/data/maps/events/SecretBase_RedCave2.inc
index 910b2c074..910b2c074 100644
--- a/data/maps/events/SecretBase_RedCave2.s
+++ b/data/maps/events/SecretBase_RedCave2.inc
diff --git a/data/maps/events/SecretBase_RedCave3.s b/data/maps/events/SecretBase_RedCave3.inc
index 8745b272f..8745b272f 100644
--- a/data/maps/events/SecretBase_RedCave3.s
+++ b/data/maps/events/SecretBase_RedCave3.inc
diff --git a/data/maps/events/SecretBase_RedCave4.s b/data/maps/events/SecretBase_RedCave4.inc
index 60928ef5c..60928ef5c 100644
--- a/data/maps/events/SecretBase_RedCave4.s
+++ b/data/maps/events/SecretBase_RedCave4.inc
diff --git a/data/maps/events/SecretBase_Shrub1.s b/data/maps/events/SecretBase_Shrub1.inc
index 17c2f2530..17c2f2530 100644
--- a/data/maps/events/SecretBase_Shrub1.s
+++ b/data/maps/events/SecretBase_Shrub1.inc
diff --git a/data/maps/events/SecretBase_Shrub2.s b/data/maps/events/SecretBase_Shrub2.inc
index 6b973e730..6b973e730 100644
--- a/data/maps/events/SecretBase_Shrub2.s
+++ b/data/maps/events/SecretBase_Shrub2.inc
diff --git a/data/maps/events/SecretBase_Shrub3.s b/data/maps/events/SecretBase_Shrub3.inc
index 12e2c7c81..12e2c7c81 100644
--- a/data/maps/events/SecretBase_Shrub3.s
+++ b/data/maps/events/SecretBase_Shrub3.inc
diff --git a/data/maps/events/SecretBase_Shrub4.s b/data/maps/events/SecretBase_Shrub4.inc
index bd3b94522..bd3b94522 100644
--- a/data/maps/events/SecretBase_Shrub4.s
+++ b/data/maps/events/SecretBase_Shrub4.inc
diff --git a/data/maps/events/SecretBase_Tree1.s b/data/maps/events/SecretBase_Tree1.inc
index 465a0d2be..465a0d2be 100644
--- a/data/maps/events/SecretBase_Tree1.s
+++ b/data/maps/events/SecretBase_Tree1.inc
diff --git a/data/maps/events/SecretBase_Tree2.s b/data/maps/events/SecretBase_Tree2.inc
index d780ed779..d780ed779 100644
--- a/data/maps/events/SecretBase_Tree2.s
+++ b/data/maps/events/SecretBase_Tree2.inc
diff --git a/data/maps/events/SecretBase_Tree3.s b/data/maps/events/SecretBase_Tree3.inc
index 0c8888764..0c8888764 100644
--- a/data/maps/events/SecretBase_Tree3.s
+++ b/data/maps/events/SecretBase_Tree3.inc
diff --git a/data/maps/events/SecretBase_Tree4.s b/data/maps/events/SecretBase_Tree4.inc
index 675ee1b8e..675ee1b8e 100644
--- a/data/maps/events/SecretBase_Tree4.s
+++ b/data/maps/events/SecretBase_Tree4.inc
diff --git a/data/maps/events/SecretBase_YellowCave1.s b/data/maps/events/SecretBase_YellowCave1.inc
index 8c6999f9b..8c6999f9b 100644
--- a/data/maps/events/SecretBase_YellowCave1.s
+++ b/data/maps/events/SecretBase_YellowCave1.inc
diff --git a/data/maps/events/SecretBase_YellowCave2.s b/data/maps/events/SecretBase_YellowCave2.inc
index 8825836bf..8825836bf 100644
--- a/data/maps/events/SecretBase_YellowCave2.s
+++ b/data/maps/events/SecretBase_YellowCave2.inc
diff --git a/data/maps/events/SecretBase_YellowCave3.s b/data/maps/events/SecretBase_YellowCave3.inc
index a88e44190..a88e44190 100644
--- a/data/maps/events/SecretBase_YellowCave3.s
+++ b/data/maps/events/SecretBase_YellowCave3.inc
diff --git a/data/maps/events/SecretBase_YellowCave4.s b/data/maps/events/SecretBase_YellowCave4.inc
index 0280e088a..0280e088a 100644
--- a/data/maps/events/SecretBase_YellowCave4.s
+++ b/data/maps/events/SecretBase_YellowCave4.inc
diff --git a/data/maps/events/ShoalCave_HighTideEntranceRoom.s b/data/maps/events/ShoalCave_HighTideEntranceRoom.inc
index c7225843f..c7225843f 100644
--- a/data/maps/events/ShoalCave_HighTideEntranceRoom.s
+++ b/data/maps/events/ShoalCave_HighTideEntranceRoom.inc
diff --git a/data/maps/events/ShoalCave_HighTideInnerRoom.s b/data/maps/events/ShoalCave_HighTideInnerRoom.inc
index e7951742a..e7951742a 100644
--- a/data/maps/events/ShoalCave_HighTideInnerRoom.s
+++ b/data/maps/events/ShoalCave_HighTideInnerRoom.inc
diff --git a/data/maps/events/ShoalCave_LowTideEntranceRoom.s b/data/maps/events/ShoalCave_LowTideEntranceRoom.inc
index a9381d0c4..a9381d0c4 100644
--- a/data/maps/events/ShoalCave_LowTideEntranceRoom.s
+++ b/data/maps/events/ShoalCave_LowTideEntranceRoom.inc
diff --git a/data/maps/events/ShoalCave_LowTideIceRoom.s b/data/maps/events/ShoalCave_LowTideIceRoom.inc
index 2d5958a37..2d5958a37 100644
--- a/data/maps/events/ShoalCave_LowTideIceRoom.s
+++ b/data/maps/events/ShoalCave_LowTideIceRoom.inc
diff --git a/data/maps/events/ShoalCave_LowTideInnerRoom.s b/data/maps/events/ShoalCave_LowTideInnerRoom.inc
index 954c4c5e9..954c4c5e9 100644
--- a/data/maps/events/ShoalCave_LowTideInnerRoom.s
+++ b/data/maps/events/ShoalCave_LowTideInnerRoom.inc
diff --git a/data/maps/events/ShoalCave_LowTideLowerRoom.s b/data/maps/events/ShoalCave_LowTideLowerRoom.inc
index a1770b5bb..a1770b5bb 100644
--- a/data/maps/events/ShoalCave_LowTideLowerRoom.s
+++ b/data/maps/events/ShoalCave_LowTideLowerRoom.inc
diff --git a/data/maps/events/ShoalCave_LowTideStairsRoom.s b/data/maps/events/ShoalCave_LowTideStairsRoom.inc
index 878b1fca0..878b1fca0 100644
--- a/data/maps/events/ShoalCave_LowTideStairsRoom.s
+++ b/data/maps/events/ShoalCave_LowTideStairsRoom.inc
diff --git a/data/maps/events/SingleBattleColosseum.s b/data/maps/events/SingleBattleColosseum.inc
index 1d4b51476..1d4b51476 100644
--- a/data/maps/events/SingleBattleColosseum.s
+++ b/data/maps/events/SingleBattleColosseum.inc
diff --git a/data/maps/events/SkyPillar_1F.s b/data/maps/events/SkyPillar_1F.inc
index eaf7fa955..eaf7fa955 100644
--- a/data/maps/events/SkyPillar_1F.s
+++ b/data/maps/events/SkyPillar_1F.inc
diff --git a/data/maps/events/SkyPillar_2F.s b/data/maps/events/SkyPillar_2F.inc
index ffd0d7d25..ffd0d7d25 100644
--- a/data/maps/events/SkyPillar_2F.s
+++ b/data/maps/events/SkyPillar_2F.inc
diff --git a/data/maps/events/SkyPillar_3F.s b/data/maps/events/SkyPillar_3F.inc
index c34440ab7..c34440ab7 100644
--- a/data/maps/events/SkyPillar_3F.s
+++ b/data/maps/events/SkyPillar_3F.inc
diff --git a/data/maps/events/SkyPillar_4F.s b/data/maps/events/SkyPillar_4F.inc
index 77586a25a..77586a25a 100644
--- a/data/maps/events/SkyPillar_4F.s
+++ b/data/maps/events/SkyPillar_4F.inc
diff --git a/data/maps/events/SkyPillar_5F.s b/data/maps/events/SkyPillar_5F.inc
index 7c4ea5a97..7c4ea5a97 100644
--- a/data/maps/events/SkyPillar_5F.s
+++ b/data/maps/events/SkyPillar_5F.inc
diff --git a/data/maps/events/SkyPillar_Entrance.s b/data/maps/events/SkyPillar_Entrance.inc
index d27442989..d27442989 100644
--- a/data/maps/events/SkyPillar_Entrance.s
+++ b/data/maps/events/SkyPillar_Entrance.inc
diff --git a/data/maps/events/SkyPillar_Outside.s b/data/maps/events/SkyPillar_Outside.inc
index 05ffe4df8..05ffe4df8 100644
--- a/data/maps/events/SkyPillar_Outside.s
+++ b/data/maps/events/SkyPillar_Outside.inc
diff --git a/data/maps/events/SkyPillar_Top.s b/data/maps/events/SkyPillar_Top.inc
index 6c9d8abc6..6c9d8abc6 100644
--- a/data/maps/events/SkyPillar_Top.s
+++ b/data/maps/events/SkyPillar_Top.inc
diff --git a/data/maps/events/SlateportCity.s b/data/maps/events/SlateportCity.inc
index bef2bf0d9..bef2bf0d9 100644
--- a/data/maps/events/SlateportCity.s
+++ b/data/maps/events/SlateportCity.inc
diff --git a/data/maps/events/SlateportCity_ContestHall.s b/data/maps/events/SlateportCity_ContestHall.inc
index ae3e4ea7b..ae3e4ea7b 100644
--- a/data/maps/events/SlateportCity_ContestHall.s
+++ b/data/maps/events/SlateportCity_ContestHall.inc
diff --git a/data/maps/events/SlateportCity_ContestLobby.s b/data/maps/events/SlateportCity_ContestLobby.inc
index 74a8bc131..74a8bc131 100644
--- a/data/maps/events/SlateportCity_ContestLobby.s
+++ b/data/maps/events/SlateportCity_ContestLobby.inc
diff --git a/data/maps/events/SlateportCity_Harbor.s b/data/maps/events/SlateportCity_Harbor.inc
index 3fbbd72c2..3fbbd72c2 100644
--- a/data/maps/events/SlateportCity_Harbor.s
+++ b/data/maps/events/SlateportCity_Harbor.inc
diff --git a/data/maps/events/SlateportCity_House1.s b/data/maps/events/SlateportCity_House1.inc
index 3379b7fef..3379b7fef 100644
--- a/data/maps/events/SlateportCity_House1.s
+++ b/data/maps/events/SlateportCity_House1.inc
diff --git a/data/maps/events/SlateportCity_House2.s b/data/maps/events/SlateportCity_House2.inc
index a147ec7ce..a147ec7ce 100644
--- a/data/maps/events/SlateportCity_House2.s
+++ b/data/maps/events/SlateportCity_House2.inc
diff --git a/data/maps/events/SlateportCity_Mart.s b/data/maps/events/SlateportCity_Mart.inc
index 54072eccc..54072eccc 100644
--- a/data/maps/events/SlateportCity_Mart.s
+++ b/data/maps/events/SlateportCity_Mart.inc
diff --git a/data/maps/events/SlateportCity_OceanicMuseum_1F.s b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc
index 9756d6745..9756d6745 100644
--- a/data/maps/events/SlateportCity_OceanicMuseum_1F.s
+++ b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc
diff --git a/data/maps/events/SlateportCity_OceanicMuseum_2F.s b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc
index a081e15d3..a081e15d3 100644
--- a/data/maps/events/SlateportCity_OceanicMuseum_2F.s
+++ b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc
diff --git a/data/maps/events/SlateportCity_PokemonCenter_1F.s b/data/maps/events/SlateportCity_PokemonCenter_1F.inc
index dfd38dc51..dfd38dc51 100644
--- a/data/maps/events/SlateportCity_PokemonCenter_1F.s
+++ b/data/maps/events/SlateportCity_PokemonCenter_1F.inc
diff --git a/data/maps/events/SlateportCity_PokemonCenter_2F.s b/data/maps/events/SlateportCity_PokemonCenter_2F.inc
index db723fa33..db723fa33 100644
--- a/data/maps/events/SlateportCity_PokemonCenter_2F.s
+++ b/data/maps/events/SlateportCity_PokemonCenter_2F.inc
diff --git a/data/maps/events/SlateportCity_PokemonFanClub.s b/data/maps/events/SlateportCity_PokemonFanClub.inc
index 8003a3439..8003a3439 100644
--- a/data/maps/events/SlateportCity_PokemonFanClub.s
+++ b/data/maps/events/SlateportCity_PokemonFanClub.inc
diff --git a/data/maps/events/SlateportCity_SternsShipyard_1F.s b/data/maps/events/SlateportCity_SternsShipyard_1F.inc
index 38d14fa4e..38d14fa4e 100644
--- a/data/maps/events/SlateportCity_SternsShipyard_1F.s
+++ b/data/maps/events/SlateportCity_SternsShipyard_1F.inc
diff --git a/data/maps/events/SlateportCity_SternsShipyard_2F.s b/data/maps/events/SlateportCity_SternsShipyard_2F.inc
index cd26ed1cc..cd26ed1cc 100644
--- a/data/maps/events/SlateportCity_SternsShipyard_2F.s
+++ b/data/maps/events/SlateportCity_SternsShipyard_2F.inc
diff --git a/data/maps/events/SootopolisCity.s b/data/maps/events/SootopolisCity.inc
index a93db6a93..a93db6a93 100644
--- a/data/maps/events/SootopolisCity.s
+++ b/data/maps/events/SootopolisCity.inc
diff --git a/data/maps/events/SootopolisCity_Gym_1F.s b/data/maps/events/SootopolisCity_Gym_1F.inc
index 88707692e..88707692e 100644
--- a/data/maps/events/SootopolisCity_Gym_1F.s
+++ b/data/maps/events/SootopolisCity_Gym_1F.inc
diff --git a/data/maps/events/SootopolisCity_Gym_B1F.s b/data/maps/events/SootopolisCity_Gym_B1F.inc
index 44827aaf5..44827aaf5 100644
--- a/data/maps/events/SootopolisCity_Gym_B1F.s
+++ b/data/maps/events/SootopolisCity_Gym_B1F.inc
diff --git a/data/maps/events/SootopolisCity_House1.s b/data/maps/events/SootopolisCity_House1.inc
index bddda2d88..bddda2d88 100644
--- a/data/maps/events/SootopolisCity_House1.s
+++ b/data/maps/events/SootopolisCity_House1.inc
diff --git a/data/maps/events/SootopolisCity_House2.s b/data/maps/events/SootopolisCity_House2.inc
index 01cf77ddb..01cf77ddb 100644
--- a/data/maps/events/SootopolisCity_House2.s
+++ b/data/maps/events/SootopolisCity_House2.inc
diff --git a/data/maps/events/SootopolisCity_House3.s b/data/maps/events/SootopolisCity_House3.inc
index dfae0f969..dfae0f969 100644
--- a/data/maps/events/SootopolisCity_House3.s
+++ b/data/maps/events/SootopolisCity_House3.inc
diff --git a/data/maps/events/SootopolisCity_House4.s b/data/maps/events/SootopolisCity_House4.inc
index 766dbc682..766dbc682 100644
--- a/data/maps/events/SootopolisCity_House4.s
+++ b/data/maps/events/SootopolisCity_House4.inc
diff --git a/data/maps/events/SootopolisCity_House5.s b/data/maps/events/SootopolisCity_House5.inc
index 499bc26de..499bc26de 100644
--- a/data/maps/events/SootopolisCity_House5.s
+++ b/data/maps/events/SootopolisCity_House5.inc
diff --git a/data/maps/events/SootopolisCity_House6.s b/data/maps/events/SootopolisCity_House6.inc
index 9fcb17f50..9fcb17f50 100644
--- a/data/maps/events/SootopolisCity_House6.s
+++ b/data/maps/events/SootopolisCity_House6.inc
diff --git a/data/maps/events/SootopolisCity_House7.s b/data/maps/events/SootopolisCity_House7.inc
index d23992a32..d23992a32 100644
--- a/data/maps/events/SootopolisCity_House7.s
+++ b/data/maps/events/SootopolisCity_House7.inc
diff --git a/data/maps/events/SootopolisCity_House8.s b/data/maps/events/SootopolisCity_House8.inc
index 4fd384f2b..4fd384f2b 100644
--- a/data/maps/events/SootopolisCity_House8.s
+++ b/data/maps/events/SootopolisCity_House8.inc
diff --git a/data/maps/events/SootopolisCity_Mart.s b/data/maps/events/SootopolisCity_Mart.inc
index 144a2b79b..144a2b79b 100644
--- a/data/maps/events/SootopolisCity_Mart.s
+++ b/data/maps/events/SootopolisCity_Mart.inc
diff --git a/data/maps/events/SootopolisCity_PokemonCenter_1F.s b/data/maps/events/SootopolisCity_PokemonCenter_1F.inc
index c69ebb84c..c69ebb84c 100644
--- a/data/maps/events/SootopolisCity_PokemonCenter_1F.s
+++ b/data/maps/events/SootopolisCity_PokemonCenter_1F.inc
diff --git a/data/maps/events/SootopolisCity_PokemonCenter_2F.s b/data/maps/events/SootopolisCity_PokemonCenter_2F.inc
index 217185c78..217185c78 100644
--- a/data/maps/events/SootopolisCity_PokemonCenter_2F.s
+++ b/data/maps/events/SootopolisCity_PokemonCenter_2F.inc
diff --git a/data/maps/events/SouthernIsland_Exterior.s b/data/maps/events/SouthernIsland_Exterior.inc
index 062b72d1f..062b72d1f 100644
--- a/data/maps/events/SouthernIsland_Exterior.s
+++ b/data/maps/events/SouthernIsland_Exterior.inc
diff --git a/data/maps/events/SouthernIsland_Interior.s b/data/maps/events/SouthernIsland_Interior.inc
index 77073fc85..77073fc85 100644
--- a/data/maps/events/SouthernIsland_Interior.s
+++ b/data/maps/events/SouthernIsland_Interior.inc
diff --git a/data/maps/events/TradeCenter.s b/data/maps/events/TradeCenter.inc
index 8c5ff5578..8c5ff5578 100644
--- a/data/maps/events/TradeCenter.s
+++ b/data/maps/events/TradeCenter.inc
diff --git a/data/maps/events/Underwater1.s b/data/maps/events/Underwater1.inc
index e67181a50..e67181a50 100644
--- a/data/maps/events/Underwater1.s
+++ b/data/maps/events/Underwater1.inc
diff --git a/data/maps/events/Underwater2.s b/data/maps/events/Underwater2.inc
index a9ecbd465..a9ecbd465 100644
--- a/data/maps/events/Underwater2.s
+++ b/data/maps/events/Underwater2.inc
diff --git a/data/maps/events/Underwater3.s b/data/maps/events/Underwater3.inc
index 1e0925650..1e0925650 100644
--- a/data/maps/events/Underwater3.s
+++ b/data/maps/events/Underwater3.inc
diff --git a/data/maps/events/Underwater4.s b/data/maps/events/Underwater4.inc
index 711131621..711131621 100644
--- a/data/maps/events/Underwater4.s
+++ b/data/maps/events/Underwater4.inc
diff --git a/data/maps/events/Underwater_Route134.s b/data/maps/events/Underwater_Route134.inc
index f6c734112..f6c734112 100644
--- a/data/maps/events/Underwater_Route134.s
+++ b/data/maps/events/Underwater_Route134.inc
diff --git a/data/maps/events/Underwater_SeafloorCavern.s b/data/maps/events/Underwater_SeafloorCavern.inc
index e06e0a498..e06e0a498 100644
--- a/data/maps/events/Underwater_SeafloorCavern.s
+++ b/data/maps/events/Underwater_SeafloorCavern.inc
diff --git a/data/maps/events/Underwater_SealedChamber.s b/data/maps/events/Underwater_SealedChamber.inc
index 867527aaf..867527aaf 100644
--- a/data/maps/events/Underwater_SealedChamber.s
+++ b/data/maps/events/Underwater_SealedChamber.inc
diff --git a/data/maps/events/Underwater_SootopolisCity.s b/data/maps/events/Underwater_SootopolisCity.inc
index fb48a32fb..fb48a32fb 100644
--- a/data/maps/events/Underwater_SootopolisCity.s
+++ b/data/maps/events/Underwater_SootopolisCity.inc
diff --git a/data/maps/events/UnknownMap_25_29.s b/data/maps/events/UnknownMap_25_29.inc
index 5f3412382..5f3412382 100644
--- a/data/maps/events/UnknownMap_25_29.s
+++ b/data/maps/events/UnknownMap_25_29.inc
diff --git a/data/maps/events/UnknownMap_25_30.s b/data/maps/events/UnknownMap_25_30.inc
index 8ce359a0b..8ce359a0b 100644
--- a/data/maps/events/UnknownMap_25_30.s
+++ b/data/maps/events/UnknownMap_25_30.inc
diff --git a/data/maps/events/UnknownMap_25_31.s b/data/maps/events/UnknownMap_25_31.inc
index f2eabe57f..f2eabe57f 100644
--- a/data/maps/events/UnknownMap_25_31.s
+++ b/data/maps/events/UnknownMap_25_31.inc
diff --git a/data/maps/events/UnknownMap_25_32.s b/data/maps/events/UnknownMap_25_32.inc
index aa0435850..aa0435850 100644
--- a/data/maps/events/UnknownMap_25_32.s
+++ b/data/maps/events/UnknownMap_25_32.inc
diff --git a/data/maps/events/UnknownMap_25_33.s b/data/maps/events/UnknownMap_25_33.inc
index db91b6ef5..db91b6ef5 100644
--- a/data/maps/events/UnknownMap_25_33.s
+++ b/data/maps/events/UnknownMap_25_33.inc
diff --git a/data/maps/events/UnknownMap_25_34.s b/data/maps/events/UnknownMap_25_34.inc
index f3778b3eb..f3778b3eb 100644
--- a/data/maps/events/UnknownMap_25_34.s
+++ b/data/maps/events/UnknownMap_25_34.inc
diff --git a/data/maps/events/VerdanturfTown.s b/data/maps/events/VerdanturfTown.inc
index 1d40f7f53..1d40f7f53 100644
--- a/data/maps/events/VerdanturfTown.s
+++ b/data/maps/events/VerdanturfTown.inc
diff --git a/data/maps/events/VerdanturfTown_ContestHall.s b/data/maps/events/VerdanturfTown_ContestHall.inc
index 36f4d58e4..36f4d58e4 100644
--- a/data/maps/events/VerdanturfTown_ContestHall.s
+++ b/data/maps/events/VerdanturfTown_ContestHall.inc
diff --git a/data/maps/events/VerdanturfTown_ContestLobby.s b/data/maps/events/VerdanturfTown_ContestLobby.inc
index ec9d88d71..ec9d88d71 100644
--- a/data/maps/events/VerdanturfTown_ContestLobby.s
+++ b/data/maps/events/VerdanturfTown_ContestLobby.inc
diff --git a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.s b/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc
index 6ec948511..6ec948511 100644
--- a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.s
+++ b/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc
diff --git a/data/maps/events/VerdanturfTown_House.s b/data/maps/events/VerdanturfTown_House.inc
index 91a54684b..91a54684b 100644
--- a/data/maps/events/VerdanturfTown_House.s
+++ b/data/maps/events/VerdanturfTown_House.inc
diff --git a/data/maps/events/VerdanturfTown_Mart.s b/data/maps/events/VerdanturfTown_Mart.inc
index 90e1cf014..90e1cf014 100644
--- a/data/maps/events/VerdanturfTown_Mart.s
+++ b/data/maps/events/VerdanturfTown_Mart.inc
diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_1F.s b/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc
index 3db30796c..3db30796c 100644
--- a/data/maps/events/VerdanturfTown_PokemonCenter_1F.s
+++ b/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc
diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_2F.s b/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc
index 89f02e31f..89f02e31f 100644
--- a/data/maps/events/VerdanturfTown_PokemonCenter_2F.s
+++ b/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc
diff --git a/data/maps/events/VerdanturfTown_WandasHouse.s b/data/maps/events/VerdanturfTown_WandasHouse.inc
index 5d0f3e572..5d0f3e572 100644
--- a/data/maps/events/VerdanturfTown_WandasHouse.s
+++ b/data/maps/events/VerdanturfTown_WandasHouse.inc
diff --git a/data/maps/events/VictoryRoad_1F.s b/data/maps/events/VictoryRoad_1F.inc
index f3f8dcad6..f3f8dcad6 100644
--- a/data/maps/events/VictoryRoad_1F.s
+++ b/data/maps/events/VictoryRoad_1F.inc
diff --git a/data/maps/events/VictoryRoad_B1F.s b/data/maps/events/VictoryRoad_B1F.inc
index a4f778c4d..a4f778c4d 100644
--- a/data/maps/events/VictoryRoad_B1F.s
+++ b/data/maps/events/VictoryRoad_B1F.inc
diff --git a/data/maps/events/VictoryRoad_B2F.s b/data/maps/events/VictoryRoad_B2F.inc
index b4aa07e59..b4aa07e59 100644
--- a/data/maps/events/VictoryRoad_B2F.s
+++ b/data/maps/events/VictoryRoad_B2F.inc
diff --git a/data/maps/headers.s b/data/maps/headers.inc
index 71b2936d7..71b2936d7 100644
--- a/data/maps/headers.s
+++ b/data/maps/headers.inc