Move data/maps/{text,scripts}/ to data/{text,scripts}/maps/.

687 files changed, 676 insertions, 676 deletions

diff --git a/data/event_scripts.s b/data/event_scripts.s
index b597acc30..2a8e5ad69 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -39,344 +39,344 @@ gStdScripts::
 	.4byte Std_ObtainDecoration
 gStdScripts_End::
 
-	.include "data/maps/scripts/PetalburgCity.s"
-	.include "data/maps/scripts/SlateportCity.s"
-	.include "data/maps/scripts/MauvilleCity.s"
-	.include "data/maps/scripts/RustboroCity.s"
-	.include "data/maps/scripts/FortreeCity.s"
-	.include "data/maps/scripts/LilycoveCity.s"
-	.include "data/maps/scripts/MossdeepCity.s"
-	.include "data/maps/scripts/SootopolisCity.s"
-	.include "data/maps/scripts/EverGrandeCity.s"
-	.include "data/maps/scripts/LittlerootTown.s"
-	.include "data/maps/scripts/OldaleTown.s"
-	.include "data/maps/scripts/DewfordTown.s"
-	.include "data/maps/scripts/LavaridgeTown.s"
-	.include "data/maps/scripts/FallarborTown.s"
-	.include "data/maps/scripts/VerdanturfTown.s"
-	.include "data/maps/scripts/PacifidlogTown.s"
-	.include "data/maps/scripts/Route101.s"
-	.include "data/maps/scripts/Route102.s"
-	.include "data/maps/scripts/Route103.s"
-	.include "data/maps/scripts/Route104.s"
-	.include "data/maps/scripts/Route105.s"
-	.include "data/maps/scripts/Route106.s"
-	.include "data/maps/scripts/Route107.s"
-	.include "data/maps/scripts/Route108.s"
-	.include "data/maps/scripts/Route109.s"
-	.include "data/maps/scripts/Route110.s"
-	.include "data/maps/scripts/Route111.s"
-	.include "data/maps/scripts/Route112.s"
-	.include "data/maps/scripts/Route113.s"
-	.include "data/maps/scripts/Route114.s"
-	.include "data/maps/scripts/Route115.s"
-	.include "data/maps/scripts/Route116.s"
-	.include "data/maps/scripts/Route117.s"
-	.include "data/maps/scripts/Route118.s"
-	.include "data/maps/scripts/Route119.s"
-	.include "data/maps/scripts/Route120.s"
-	.include "data/maps/scripts/Route121.s"
-	.include "data/maps/scripts/Route122.s"
-	.include "data/maps/scripts/Route123.s"
-	.include "data/maps/scripts/Route124.s"
-	.include "data/maps/scripts/Route125.s"
-	.include "data/maps/scripts/Route126.s"
-	.include "data/maps/scripts/Route127.s"
-	.include "data/maps/scripts/Route128.s"
-	.include "data/maps/scripts/Route129.s"
-	.include "data/maps/scripts/Route130.s"
-	.include "data/maps/scripts/Route131.s"
-	.include "data/maps/scripts/Route132.s"
-	.include "data/maps/scripts/Route133.s"
-	.include "data/maps/scripts/Route134.s"
-	.include "data/maps/scripts/Underwater1.s"
-	.include "data/maps/scripts/Underwater2.s"
-	.include "data/maps/scripts/Underwater3.s"
-	.include "data/maps/scripts/Underwater4.s"
-	.include "data/maps/scripts/LittlerootTown_BrendansHouse_1F.s"
-	.include "data/maps/scripts/LittlerootTown_BrendansHouse_2F.s"
-	.include "data/maps/scripts/LittlerootTown_ProfessorBirchsLab.s"
-	.include "data/maps/scripts/OldaleTown_House1.s"
-	.include "data/maps/scripts/OldaleTown_House2.s"
-	.include "data/maps/scripts/OldaleTown_PokemonCenter_1F.s"
-	.include "data/maps/scripts/OldaleTown_PokemonCenter_2F.s"
-	.include "data/maps/scripts/OldaleTown_Mart.s"
-	.include "data/maps/scripts/DewfordTown_House1.s"
-	.include "data/maps/scripts/DewfordTown_PokemonCenter_1F.s"
-	.include "data/maps/scripts/DewfordTown_PokemonCenter_2F.s"
-	.include "data/maps/scripts/DewfordTown_Gym.s"
-	.include "data/maps/scripts/DewfordTown_Hall.s"
-	.include "data/maps/scripts/DewfordTown_House2.s"
-	.include "data/maps/scripts/LavaridgeTown_HerbShop.s"
-	.include "data/maps/scripts/LavaridgeTown_Gym_1F.s"
-	.include "data/maps/scripts/LavaridgeTown_Gym_B1F.s"
-	.include "data/maps/scripts/LavaridgeTown_House.s"
-	.include "data/maps/scripts/LavaridgeTown_Mart.s"
-	.include "data/maps/scripts/LavaridgeTown_PokemonCenter_1F.s"
-	.include "data/maps/scripts/LavaridgeTown_PokemonCenter_2F.s"
-	.include "data/maps/scripts/FallarborTown_Mart.s"
-	.include "data/maps/scripts/FallarborTown_ContestLobby.s"
-	.include "data/maps/scripts/FallarborTown_ContestHall.s"
-	.include "data/maps/scripts/FallarborTown_PokemonCenter_1F.s"
-	.include "data/maps/scripts/FallarborTown_PokemonCenter_2F.s"
-	.include "data/maps/scripts/FallarborTown_House1.s"
-	.include "data/maps/scripts/FallarborTown_House2.s"
-	.include "data/maps/scripts/VerdanturfTown_ContestLobby.s"
-	.include "data/maps/scripts/VerdanturfTown_ContestHall.s"
-	.include "data/maps/scripts/VerdanturfTown_Mart.s"
-	.include "data/maps/scripts/VerdanturfTown_PokemonCenter_1F.s"
-	.include "data/maps/scripts/VerdanturfTown_PokemonCenter_2F.s"
-	.include "data/maps/scripts/VerdanturfTown_WandasHouse.s"
-	.include "data/maps/scripts/VerdanturfTown_FriendshipRatersHouse.s"
-	.include "data/maps/scripts/VerdanturfTown_House.s"
-	.include "data/maps/scripts/PacifidlogTown_PokemonCenter_1F.s"
-	.include "data/maps/scripts/PacifidlogTown_PokemonCenter_2F.s"
-	.include "data/maps/scripts/PacifidlogTown_House1.s"
-	.include "data/maps/scripts/PacifidlogTown_House2.s"
-	.include "data/maps/scripts/PacifidlogTown_House3.s"
-	.include "data/maps/scripts/PacifidlogTown_House4.s"
-	.include "data/maps/scripts/PacifidlogTown_House5.s"
-	.include "data/maps/scripts/PetalburgCity_WallysHouse.s"
-	.include "data/maps/scripts/PetalburgCity_Gym.s"
-	.include "data/maps/scripts/PetalburgCity_House1.s"
-	.include "data/maps/scripts/PetalburgCity_House2.s"
-	.include "data/maps/scripts/PetalburgCity_PokemonCenter_1F.s"
-	.include "data/maps/scripts/PetalburgCity_PokemonCenter_2F.s"
-	.include "data/maps/scripts/PetalburgCity_Mart.s"
-	.include "data/maps/scripts/SlateportCity_SternsShipyard_1F.s"
-	.include "data/maps/scripts/SlateportCity_SternsShipyard_2F.s"
-	.include "data/maps/scripts/SlateportCity_ContestLobby.s"
-	.include "data/maps/scripts/SlateportCity_ContestHall.s"
-	.include "data/maps/scripts/SlateportCity_House1.s"
-	.include "data/maps/scripts/SlateportCity_PokemonFanClub.s"
-	.include "data/maps/scripts/SlateportCity_OceanicMuseum_1F.s"
-	.include "data/maps/scripts/SlateportCity_OceanicMuseum_2F.s"
-	.include "data/maps/scripts/SlateportCity_Harbor.s"
-	.include "data/maps/scripts/SlateportCity_House2.s"
-	.include "data/maps/scripts/SlateportCity_PokemonCenter_1F.s"
-	.include "data/maps/scripts/SlateportCity_PokemonCenter_2F.s"
-	.include "data/maps/scripts/SlateportCity_Mart.s"
-	.include "data/maps/scripts/MauvilleCity_Gym.s"
-	.include "data/maps/scripts/MauvilleCity_BikeShop.s"
-	.include "data/maps/scripts/MauvilleCity_House1.s"
-	.include "data/maps/scripts/MauvilleCity_GameCorner.s"
-	.include "data/maps/scripts/MauvilleCity_House2.s"
-	.include "data/maps/scripts/MauvilleCity_PokemonCenter_1F.s"
-	.include "data/maps/scripts/MauvilleCity_PokemonCenter_2F.s"
-	.include "data/maps/scripts/MauvilleCity_Mart.s"
-	.include "data/maps/scripts/RustboroCity_DevonCorp_1F.s"
-	.include "data/maps/scripts/RustboroCity_DevonCorp_2F.s"
-	.include "data/maps/scripts/RustboroCity_DevonCorp_3F.s"
-	.include "data/maps/scripts/RustboroCity_Gym.s"
-	.include "data/maps/scripts/RustboroCity_PokemonSchool.s"
-	.include "data/maps/scripts/RustboroCity_PokemonCenter_1F.s"
-	.include "data/maps/scripts/RustboroCity_PokemonCenter_2F.s"
-	.include "data/maps/scripts/RustboroCity_Mart.s"
-	.include "data/maps/scripts/RustboroCity_Flat1_1F.s"
-	.include "data/maps/scripts/RustboroCity_Flat1_2F.s"
-	.include "data/maps/scripts/RustboroCity_House1.s"
-	.include "data/maps/scripts/RustboroCity_CuttersHouse.s"
-	.include "data/maps/scripts/RustboroCity_House2.s"
-	.include "data/maps/scripts/RustboroCity_Flat2_1F.s"
-	.include "data/maps/scripts/RustboroCity_Flat2_2F.s"
-	.include "data/maps/scripts/RustboroCity_Flat2_3F.s"
-	.include "data/maps/scripts/RustboroCity_House3.s"
-	.include "data/maps/scripts/FortreeCity_House1.s"
-	.include "data/maps/scripts/FortreeCity_Gym.s"
-	.include "data/maps/scripts/FortreeCity_PokemonCenter_1F.s"
-	.include "data/maps/scripts/FortreeCity_PokemonCenter_2F.s"
-	.include "data/maps/scripts/FortreeCity_Mart.s"
-	.include "data/maps/scripts/FortreeCity_House2.s"
-	.include "data/maps/scripts/FortreeCity_House3.s"
-	.include "data/maps/scripts/FortreeCity_House4.s"
-	.include "data/maps/scripts/FortreeCity_House5.s"
-	.include "data/maps/scripts/FortreeCity_DecorationShop.s"
-	.include "data/maps/scripts/LilycoveCity_CoveLilyMotel_1F.s"
-	.include "data/maps/scripts/LilycoveCity_CoveLilyMotel_2F.s"
-	.include "data/maps/scripts/LilycoveCity_LilycoveMuseum_1F.s"
-	.include "data/maps/scripts/LilycoveCity_LilycoveMuseum_2F.s"
-	.include "data/maps/scripts/LilycoveCity_ContestLobby.s"
-	.include "data/maps/scripts/LilycoveCity_ContestHall.s"
-	.include "data/maps/scripts/LilycoveCity_PokemonCenter_1F.s"
-	.include "data/maps/scripts/LilycoveCity_PokemonCenter_2F.s"
-	.include "data/maps/scripts/LilycoveCity_UnusedMart.s"
-	.include "data/maps/scripts/LilycoveCity_PokemonTrainerFanClub.s"
-	.include "data/maps/scripts/LilycoveCity_Harbor.s"
-	.include "data/maps/scripts/LilycoveCity_EmptyMap.s"
-	.include "data/maps/scripts/LilycoveCity_MoveDeletersHouse.s"
-	.include "data/maps/scripts/LilycoveCity_House1.s"
-	.include "data/maps/scripts/LilycoveCity_House2.s"
-	.include "data/maps/scripts/LilycoveCity_House3.s"
-	.include "data/maps/scripts/LilycoveCity_House4.s"
-	.include "data/maps/scripts/LilycoveCity_DepartmentStore_1F.s"
-	.include "data/maps/scripts/LilycoveCity_DepartmentStore_2F.s"
-	.include "data/maps/scripts/LilycoveCity_DepartmentStore_3F.s"
-	.include "data/maps/scripts/LilycoveCity_DepartmentStore_4F.s"
-	.include "data/maps/scripts/LilycoveCity_DepartmentStore_5F.s"
-	.include "data/maps/scripts/LilycoveCity_DepartmentStoreRooftop.s"
-	.include "data/maps/scripts/LilycoveCity_DepartmentStoreElevator.s"
-	.include "data/maps/scripts/MossdeepCity_Gym.s"
-	.include "data/maps/scripts/MossdeepCity_House1.s"
-	.include "data/maps/scripts/MossdeepCity_House2.s"
-	.include "data/maps/scripts/MossdeepCity_PokemonCenter_1F.s"
-	.include "data/maps/scripts/MossdeepCity_PokemonCenter_2F.s"
-	.include "data/maps/scripts/MossdeepCity_Mart.s"
-	.include "data/maps/scripts/MossdeepCity_House3.s"
-	.include "data/maps/scripts/MossdeepCity_StevensHouse.s"
-	.include "data/maps/scripts/MossdeepCity_House4.s"
-	.include "data/maps/scripts/MossdeepCity_SpaceCenter_1F.s"
-	.include "data/maps/scripts/MossdeepCity_SpaceCenter_2F.s"
-	.include "data/maps/scripts/MossdeepCity_GameCorner_1F.s"
-	.include "data/maps/scripts/MossdeepCity_GameCorner_B1F.s"
-	.include "data/maps/scripts/SootopolisCity_Gym_1F.s"
-	.include "data/maps/scripts/SootopolisCity_Gym_B1F.s"
-	.include "data/maps/scripts/SootopolisCity_PokemonCenter_1F.s"
-	.include "data/maps/scripts/SootopolisCity_PokemonCenter_2F.s"
-	.include "data/maps/scripts/SootopolisCity_Mart.s"
-	.include "data/maps/scripts/SootopolisCity_House1.s"
-	.include "data/maps/scripts/SootopolisCity_House2.s"
-	.include "data/maps/scripts/SootopolisCity_House3.s"
-	.include "data/maps/scripts/SootopolisCity_House4.s"
-	.include "data/maps/scripts/SootopolisCity_House5.s"
-	.include "data/maps/scripts/SootopolisCity_House6.s"
-	.include "data/maps/scripts/SootopolisCity_House7.s"
-	.include "data/maps/scripts/SootopolisCity_House8.s"
-	.include "data/maps/scripts/EverGrandeCity_SidneysRoom.s"
-	.include "data/maps/scripts/EverGrandeCity_PhoebesRoom.s"
-	.include "data/maps/scripts/EverGrandeCity_GlaciasRoom.s"
-	.include "data/maps/scripts/EverGrandeCity_DrakesRoom.s"
-	.include "data/maps/scripts/EverGrandeCity_ChampionsRoom.s"
-	.include "data/maps/scripts/EverGrandeCity_Corridor1.s"
-	.include "data/maps/scripts/EverGrandeCity_Corridor2.s"
-	.include "data/maps/scripts/EverGrandeCity_Corridor3.s"
-	.include "data/maps/scripts/EverGrandeCity_Corridor4.s"
-	.include "data/maps/scripts/EverGrandeCity_Corridor5.s"
-	.include "data/maps/scripts/EverGrandeCity_PokemonLeague.s"
-	.include "data/maps/scripts/EverGrandeCity_HallOfFame.s"
-	.include "data/maps/scripts/EverGrandeCity_PokemonCenter_1F.s"
-	.include "data/maps/scripts/EverGrandeCity_PokemonCenter_2F.s"
-	.include "data/maps/scripts/Route104_MrBrineysHouse.s"
-	.include "data/maps/scripts/Route104_PrettyPetalFlowerShop.s"
-	.include "data/maps/scripts/Route111_WinstrateFamilysHouse.s"
-	.include "data/maps/scripts/Route111_OldLadysRestStop.s"
-	.include "data/maps/scripts/Route112_CableCarStation.s"
-	.include "data/maps/scripts/MtChimney_CableCarStation.s"
-	.include "data/maps/scripts/Route114_FossilManiacsHouse.s"
-	.include "data/maps/scripts/Route114_FossilManiacsTunnel.s"
-	.include "data/maps/scripts/Route114_LanettesHouse.s"
-	.include "data/maps/scripts/Route116_TunnelersRestHouse.s"
-	.include "data/maps/scripts/Route117_PokemonDayCare.s"
-	.include "data/maps/scripts/Route121_SafariZoneEntrance.s"
-	.include "data/maps/scripts/MeteorFalls_1F_1R.s"
-	.include "data/maps/scripts/MeteorFalls_1F_2R.s"
-	.include "data/maps/scripts/MeteorFalls_B1F_1R.s"
-	.include "data/maps/scripts/MeteorFalls_B1F_2R.s"
-	.include "data/maps/scripts/RusturfTunnel.s"
-	.include "data/maps/scripts/Underwater_SootopolisCity.s"
-	.include "data/maps/scripts/DesertRuins.s"
-	.include "data/maps/scripts/GraniteCave_1F.s"
-	.include "data/maps/scripts/GraniteCave_B1F.s"
-	.include "data/maps/scripts/GraniteCave_B2F.s"
-	.include "data/maps/scripts/GraniteCave_StevensRoom.s"
-	.include "data/maps/scripts/PetalburgWoods.s"
-	.include "data/maps/scripts/MtChimney.s"
-	.include "data/maps/scripts/JaggedPass.s"
-	.include "data/maps/scripts/FieryPath.s"
-	.include "data/maps/scripts/MtPyre_1F.s"
-	.include "data/maps/scripts/MtPyre_2F.s"
-	.include "data/maps/scripts/MtPyre_3F.s"
-	.include "data/maps/scripts/MtPyre_4F.s"
-	.include "data/maps/scripts/MtPyre_5F.s"
-	.include "data/maps/scripts/MtPyre_6F.s"
-	.include "data/maps/scripts/MtPyre_Exterior.s"
-	.include "data/maps/scripts/MtPyre_Summit.s"
-	.include "data/maps/scripts/AquaHideout_1F.s"
-	.include "data/maps/scripts/AquaHideout_B1F.s"
-	.include "data/maps/scripts/AquaHideout_B2F.s"
-	.include "data/maps/scripts/Underwater_SeafloorCavern.s"
-	.include "data/maps/scripts/SeafloorCavern_Entrance.s"
-	.include "data/maps/scripts/SeafloorCavern_Room1.s"
-	.include "data/maps/scripts/SeafloorCavern_Room2.s"
-	.include "data/maps/scripts/SeafloorCavern_Room3.s"
-	.include "data/maps/scripts/SeafloorCavern_Room4.s"
-	.include "data/maps/scripts/SeafloorCavern_Room5.s"
-	.include "data/maps/scripts/SeafloorCavern_Room6.s"
-	.include "data/maps/scripts/SeafloorCavern_Room7.s"
-	.include "data/maps/scripts/SeafloorCavern_Room8.s"
-	.include "data/maps/scripts/SeafloorCavern_Room9.s"
-	.include "data/maps/scripts/CaveOfOrigin_Entrance.s"
-	.include "data/maps/scripts/CaveOfOrigin_1F.s"
-	.include "data/maps/scripts/CaveOfOrigin_B1F.s"
-	.include "data/maps/scripts/CaveOfOrigin_B2F.s"
-	.include "data/maps/scripts/CaveOfOrigin_B3F.s"
-	.include "data/maps/scripts/CaveOfOrigin_B4F.s"
-	.include "data/maps/scripts/VictoryRoad_1F.s"
-	.include "data/maps/scripts/VictoryRoad_B1F.s"
-	.include "data/maps/scripts/VictoryRoad_B2F.s"
-	.include "data/maps/scripts/ShoalCave_LowTideEntranceRoom.s"
-	.include "data/maps/scripts/ShoalCave_LowTideInnerRoom.s"
-	.include "data/maps/scripts/ShoalCave_LowTideStairsRoom.s"
-	.include "data/maps/scripts/ShoalCave_LowTideLowerRoom.s"
-	.include "data/maps/scripts/ShoalCave_HighTideEntranceRoom.s"
-	.include "data/maps/scripts/ShoalCave_HighTideInnerRoom.s"
-	.include "data/maps/scripts/NewMauville_Entrance.s"
-	.include "data/maps/scripts/NewMauville_Inside.s"
-	.include "data/maps/scripts/AbandonedShip_Deck.s"
-	.include "data/maps/scripts/AbandonedShip_Corridors_1F.s"
-	.include "data/maps/scripts/AbandonedShip_Rooms_1F.s"
-	.include "data/maps/scripts/AbandonedShip_Corridors_B1F.s"
-	.include "data/maps/scripts/AbandonedShip_Rooms_B1F.s"
-	.include "data/maps/scripts/AbandonedShip_Rooms2_B1F.s"
-	.include "data/maps/scripts/AbandonedShip_Underwater1.s"
-	.include "data/maps/scripts/AbandonedShip_Room_B1F.s"
-	.include "data/maps/scripts/AbandonedShip_Rooms2_1F.s"
-	.include "data/maps/scripts/AbandonedShip_CaptainsOffice.s"
-	.include "data/maps/scripts/AbandonedShip_Underwater2.s"
-	.include "data/maps/scripts/AbandonedShip_HiddenFloorCorridors.s"
-	.include "data/maps/scripts/AbandonedShip_HiddenFloorRooms.s"
-	.include "data/maps/scripts/IslandCave.s"
-	.include "data/maps/scripts/AncientTomb.s"
-	.include "data/maps/scripts/Underwater_Route134.s"
-	.include "data/maps/scripts/Underwater_SealedChamber.s"
-	.include "data/maps/scripts/SealedChamber_OuterRoom.s"
-	.include "data/maps/scripts/SealedChamber_InnerRoom.s"
-	.include "data/maps/scripts/ScorchedSlab.s"
-	.include "data/maps/scripts/MagmaHideout_1F.s"
-	.include "data/maps/scripts/MagmaHideout_B1F.s"
-	.include "data/maps/scripts/MagmaHideout_B2F.s"
-	.include "data/maps/scripts/SkyPillar_Entrance.s"
-	.include "data/maps/scripts/SkyPillar_Outside.s"
-	.include "data/maps/scripts/SkyPillar_1F.s"
-	.include "data/maps/scripts/SkyPillar_2F.s"
-	.include "data/maps/scripts/SkyPillar_3F.s"
-	.include "data/maps/scripts/SkyPillar_4F.s"
-	.include "data/maps/scripts/ShoalCave_LowTideIceRoom.s"
-	.include "data/maps/scripts/SkyPillar_5F.s"
-	.include "data/maps/scripts/SkyPillar_Top.s"
-	.include "data/maps/scripts/SecretBase_BlueCave1.s"
-	.include "data/maps/scripts/SecretBase_BlueCave2.s"
-	.include "data/maps/scripts/SecretBase_BlueCave3.s"
-	.include "data/maps/scripts/SecretBase_BlueCave4.s"
-	.include "data/maps/scripts/SecretBase_BrownCave1.s"
-	.include "data/maps/scripts/SecretBase_BrownCave2.s"
-	.include "data/maps/scripts/SecretBase_BrownCave3.s"
-	.include "data/maps/scripts/SecretBase_BrownCave4.s"
-	.include "data/maps/scripts/SecretBase_RedCave1.s"
-	.include "data/maps/scripts/SecretBase_RedCave2.s"
-	.include "data/maps/scripts/SecretBase_RedCave3.s"
-	.include "data/maps/scripts/SecretBase_RedCave4.s"
-	.include "data/maps/scripts/SecretBase_Shrub1.s"
-	.include "data/maps/scripts/SecretBase_Shrub2.s"
-	.include "data/maps/scripts/SecretBase_Shrub3.s"
-	.include "data/maps/scripts/SecretBase_Shrub4.s"
-	.include "data/maps/scripts/SecretBase_Tree1.s"
-	.include "data/maps/scripts/SecretBase_Tree2.s"
-	.include "data/maps/scripts/SecretBase_Tree3.s"
-	.include "data/maps/scripts/SecretBase_Tree4.s"
-	.include "data/maps/scripts/SecretBase_YellowCave1.s"
-	.include "data/maps/scripts/SecretBase_YellowCave2.s"
-	.include "data/maps/scripts/SecretBase_YellowCave3.s"
-	.include "data/maps/scripts/SecretBase_YellowCave4.s"
+	.include "data/scripts/maps/PetalburgCity.s"
+	.include "data/scripts/maps/SlateportCity.s"
+	.include "data/scripts/maps/MauvilleCity.s"
+	.include "data/scripts/maps/RustboroCity.s"
+	.include "data/scripts/maps/FortreeCity.s"
+	.include "data/scripts/maps/LilycoveCity.s"
+	.include "data/scripts/maps/MossdeepCity.s"
+	.include "data/scripts/maps/SootopolisCity.s"
+	.include "data/scripts/maps/EverGrandeCity.s"
+	.include "data/scripts/maps/LittlerootTown.s"
+	.include "data/scripts/maps/OldaleTown.s"
+	.include "data/scripts/maps/DewfordTown.s"
+	.include "data/scripts/maps/LavaridgeTown.s"
+	.include "data/scripts/maps/FallarborTown.s"
+	.include "data/scripts/maps/VerdanturfTown.s"
+	.include "data/scripts/maps/PacifidlogTown.s"
+	.include "data/scripts/maps/Route101.s"
+	.include "data/scripts/maps/Route102.s"
+	.include "data/scripts/maps/Route103.s"
+	.include "data/scripts/maps/Route104.s"
+	.include "data/scripts/maps/Route105.s"
+	.include "data/scripts/maps/Route106.s"
+	.include "data/scripts/maps/Route107.s"
+	.include "data/scripts/maps/Route108.s"
+	.include "data/scripts/maps/Route109.s"
+	.include "data/scripts/maps/Route110.s"
+	.include "data/scripts/maps/Route111.s"
+	.include "data/scripts/maps/Route112.s"
+	.include "data/scripts/maps/Route113.s"
+	.include "data/scripts/maps/Route114.s"
+	.include "data/scripts/maps/Route115.s"
+	.include "data/scripts/maps/Route116.s"
+	.include "data/scripts/maps/Route117.s"
+	.include "data/scripts/maps/Route118.s"
+	.include "data/scripts/maps/Route119.s"
+	.include "data/scripts/maps/Route120.s"
+	.include "data/scripts/maps/Route121.s"
+	.include "data/scripts/maps/Route122.s"
+	.include "data/scripts/maps/Route123.s"
+	.include "data/scripts/maps/Route124.s"
+	.include "data/scripts/maps/Route125.s"
+	.include "data/scripts/maps/Route126.s"
+	.include "data/scripts/maps/Route127.s"
+	.include "data/scripts/maps/Route128.s"
+	.include "data/scripts/maps/Route129.s"
+	.include "data/scripts/maps/Route130.s"
+	.include "data/scripts/maps/Route131.s"
+	.include "data/scripts/maps/Route132.s"
+	.include "data/scripts/maps/Route133.s"
+	.include "data/scripts/maps/Route134.s"
+	.include "data/scripts/maps/Underwater1.s"
+	.include "data/scripts/maps/Underwater2.s"
+	.include "data/scripts/maps/Underwater3.s"
+	.include "data/scripts/maps/Underwater4.s"
+	.include "data/scripts/maps/LittlerootTown_BrendansHouse_1F.s"
+	.include "data/scripts/maps/LittlerootTown_BrendansHouse_2F.s"
+	.include "data/scripts/maps/LittlerootTown_ProfessorBirchsLab.s"
+	.include "data/scripts/maps/OldaleTown_House1.s"
+	.include "data/scripts/maps/OldaleTown_House2.s"
+	.include "data/scripts/maps/OldaleTown_PokemonCenter_1F.s"
+	.include "data/scripts/maps/OldaleTown_PokemonCenter_2F.s"
+	.include "data/scripts/maps/OldaleTown_Mart.s"
+	.include "data/scripts/maps/DewfordTown_House1.s"
+	.include "data/scripts/maps/DewfordTown_PokemonCenter_1F.s"
+	.include "data/scripts/maps/DewfordTown_PokemonCenter_2F.s"
+	.include "data/scripts/maps/DewfordTown_Gym.s"
+	.include "data/scripts/maps/DewfordTown_Hall.s"
+	.include "data/scripts/maps/DewfordTown_House2.s"
+	.include "data/scripts/maps/LavaridgeTown_HerbShop.s"
+	.include "data/scripts/maps/LavaridgeTown_Gym_1F.s"
+	.include "data/scripts/maps/LavaridgeTown_Gym_B1F.s"
+	.include "data/scripts/maps/LavaridgeTown_House.s"
+	.include "data/scripts/maps/LavaridgeTown_Mart.s"
+	.include "data/scripts/maps/LavaridgeTown_PokemonCenter_1F.s"
+	.include "data/scripts/maps/LavaridgeTown_PokemonCenter_2F.s"
+	.include "data/scripts/maps/FallarborTown_Mart.s"
+	.include "data/scripts/maps/FallarborTown_ContestLobby.s"
+	.include "data/scripts/maps/FallarborTown_ContestHall.s"
+	.include "data/scripts/maps/FallarborTown_PokemonCenter_1F.s"
+	.include "data/scripts/maps/FallarborTown_PokemonCenter_2F.s"
+	.include "data/scripts/maps/FallarborTown_House1.s"
+	.include "data/scripts/maps/FallarborTown_House2.s"
+	.include "data/scripts/maps/VerdanturfTown_ContestLobby.s"
+	.include "data/scripts/maps/VerdanturfTown_ContestHall.s"
+	.include "data/scripts/maps/VerdanturfTown_Mart.s"
+	.include "data/scripts/maps/VerdanturfTown_PokemonCenter_1F.s"
+	.include "data/scripts/maps/VerdanturfTown_PokemonCenter_2F.s"
+	.include "data/scripts/maps/VerdanturfTown_WandasHouse.s"
+	.include "data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.s"
+	.include "data/scripts/maps/VerdanturfTown_House.s"
+	.include "data/scripts/maps/PacifidlogTown_PokemonCenter_1F.s"
+	.include "data/scripts/maps/PacifidlogTown_PokemonCenter_2F.s"
+	.include "data/scripts/maps/PacifidlogTown_House1.s"
+	.include "data/scripts/maps/PacifidlogTown_House2.s"
+	.include "data/scripts/maps/PacifidlogTown_House3.s"
+	.include "data/scripts/maps/PacifidlogTown_House4.s"
+	.include "data/scripts/maps/PacifidlogTown_House5.s"
+	.include "data/scripts/maps/PetalburgCity_WallysHouse.s"
+	.include "data/scripts/maps/PetalburgCity_Gym.s"
+	.include "data/scripts/maps/PetalburgCity_House1.s"
+	.include "data/scripts/maps/PetalburgCity_House2.s"
+	.include "data/scripts/maps/PetalburgCity_PokemonCenter_1F.s"
+	.include "data/scripts/maps/PetalburgCity_PokemonCenter_2F.s"
+	.include "data/scripts/maps/PetalburgCity_Mart.s"
+	.include "data/scripts/maps/SlateportCity_SternsShipyard_1F.s"
+	.include "data/scripts/maps/SlateportCity_SternsShipyard_2F.s"
+	.include "data/scripts/maps/SlateportCity_ContestLobby.s"
+	.include "data/scripts/maps/SlateportCity_ContestHall.s"
+	.include "data/scripts/maps/SlateportCity_House1.s"
+	.include "data/scripts/maps/SlateportCity_PokemonFanClub.s"
+	.include "data/scripts/maps/SlateportCity_OceanicMuseum_1F.s"
+	.include "data/scripts/maps/SlateportCity_OceanicMuseum_2F.s"
+	.include "data/scripts/maps/SlateportCity_Harbor.s"
+	.include "data/scripts/maps/SlateportCity_House2.s"
+	.include "data/scripts/maps/SlateportCity_PokemonCenter_1F.s"
+	.include "data/scripts/maps/SlateportCity_PokemonCenter_2F.s"
+	.include "data/scripts/maps/SlateportCity_Mart.s"
+	.include "data/scripts/maps/MauvilleCity_Gym.s"
+	.include "data/scripts/maps/MauvilleCity_BikeShop.s"
+	.include "data/scripts/maps/MauvilleCity_House1.s"
+	.include "data/scripts/maps/MauvilleCity_GameCorner.s"
+	.include "data/scripts/maps/MauvilleCity_House2.s"
+	.include "data/scripts/maps/MauvilleCity_PokemonCenter_1F.s"
+	.include "data/scripts/maps/MauvilleCity_PokemonCenter_2F.s"
+	.include "data/scripts/maps/MauvilleCity_Mart.s"
+	.include "data/scripts/maps/RustboroCity_DevonCorp_1F.s"
+	.include "data/scripts/maps/RustboroCity_DevonCorp_2F.s"
+	.include "data/scripts/maps/RustboroCity_DevonCorp_3F.s"
+	.include "data/scripts/maps/RustboroCity_Gym.s"
+	.include "data/scripts/maps/RustboroCity_PokemonSchool.s"
+	.include "data/scripts/maps/RustboroCity_PokemonCenter_1F.s"
+	.include "data/scripts/maps/RustboroCity_PokemonCenter_2F.s"
+	.include "data/scripts/maps/RustboroCity_Mart.s"
+	.include "data/scripts/maps/RustboroCity_Flat1_1F.s"
+	.include "data/scripts/maps/RustboroCity_Flat1_2F.s"
+	.include "data/scripts/maps/RustboroCity_House1.s"
+	.include "data/scripts/maps/RustboroCity_CuttersHouse.s"
+	.include "data/scripts/maps/RustboroCity_House2.s"
+	.include "data/scripts/maps/RustboroCity_Flat2_1F.s"
+	.include "data/scripts/maps/RustboroCity_Flat2_2F.s"
+	.include "data/scripts/maps/RustboroCity_Flat2_3F.s"
+	.include "data/scripts/maps/RustboroCity_House3.s"
+	.include "data/scripts/maps/FortreeCity_House1.s"
+	.include "data/scripts/maps/FortreeCity_Gym.s"
+	.include "data/scripts/maps/FortreeCity_PokemonCenter_1F.s"
+	.include "data/scripts/maps/FortreeCity_PokemonCenter_2F.s"
+	.include "data/scripts/maps/FortreeCity_Mart.s"
+	.include "data/scripts/maps/FortreeCity_House2.s"
+	.include "data/scripts/maps/FortreeCity_House3.s"
+	.include "data/scripts/maps/FortreeCity_House4.s"
+	.include "data/scripts/maps/FortreeCity_House5.s"
+	.include "data/scripts/maps/FortreeCity_DecorationShop.s"
+	.include "data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.s"
+	.include "data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.s"
+	.include "data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.s"
+	.include "data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.s"
+	.include "data/scripts/maps/LilycoveCity_ContestLobby.s"
+	.include "data/scripts/maps/LilycoveCity_ContestHall.s"
+	.include "data/scripts/maps/LilycoveCity_PokemonCenter_1F.s"
+	.include "data/scripts/maps/LilycoveCity_PokemonCenter_2F.s"
+	.include "data/scripts/maps/LilycoveCity_UnusedMart.s"
+	.include "data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.s"
+	.include "data/scripts/maps/LilycoveCity_Harbor.s"
+	.include "data/scripts/maps/LilycoveCity_EmptyMap.s"
+	.include "data/scripts/maps/LilycoveCity_MoveDeletersHouse.s"
+	.include "data/scripts/maps/LilycoveCity_House1.s"
+	.include "data/scripts/maps/LilycoveCity_House2.s"
+	.include "data/scripts/maps/LilycoveCity_House3.s"
+	.include "data/scripts/maps/LilycoveCity_House4.s"
+	.include "data/scripts/maps/LilycoveCity_DepartmentStore_1F.s"
+	.include "data/scripts/maps/LilycoveCity_DepartmentStore_2F.s"
+	.include "data/scripts/maps/LilycoveCity_DepartmentStore_3F.s"
+	.include "data/scripts/maps/LilycoveCity_DepartmentStore_4F.s"
+	.include "data/scripts/maps/LilycoveCity_DepartmentStore_5F.s"
+	.include "data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.s"
+	.include "data/scripts/maps/LilycoveCity_DepartmentStoreElevator.s"
+	.include "data/scripts/maps/MossdeepCity_Gym.s"
+	.include "data/scripts/maps/MossdeepCity_House1.s"
+	.include "data/scripts/maps/MossdeepCity_House2.s"
+	.include "data/scripts/maps/MossdeepCity_PokemonCenter_1F.s"
+	.include "data/scripts/maps/MossdeepCity_PokemonCenter_2F.s"
+	.include "data/scripts/maps/MossdeepCity_Mart.s"
+	.include "data/scripts/maps/MossdeepCity_House3.s"
+	.include "data/scripts/maps/MossdeepCity_StevensHouse.s"
+	.include "data/scripts/maps/MossdeepCity_House4.s"
+	.include "data/scripts/maps/MossdeepCity_SpaceCenter_1F.s"
+	.include "data/scripts/maps/MossdeepCity_SpaceCenter_2F.s"
+	.include "data/scripts/maps/MossdeepCity_GameCorner_1F.s"
+	.include "data/scripts/maps/MossdeepCity_GameCorner_B1F.s"
+	.include "data/scripts/maps/SootopolisCity_Gym_1F.s"
+	.include "data/scripts/maps/SootopolisCity_Gym_B1F.s"
+	.include "data/scripts/maps/SootopolisCity_PokemonCenter_1F.s"
+	.include "data/scripts/maps/SootopolisCity_PokemonCenter_2F.s"
+	.include "data/scripts/maps/SootopolisCity_Mart.s"
+	.include "data/scripts/maps/SootopolisCity_House1.s"
+	.include "data/scripts/maps/SootopolisCity_House2.s"
+	.include "data/scripts/maps/SootopolisCity_House3.s"
+	.include "data/scripts/maps/SootopolisCity_House4.s"
+	.include "data/scripts/maps/SootopolisCity_House5.s"
+	.include "data/scripts/maps/SootopolisCity_House6.s"
+	.include "data/scripts/maps/SootopolisCity_House7.s"
+	.include "data/scripts/maps/SootopolisCity_House8.s"
+	.include "data/scripts/maps/EverGrandeCity_SidneysRoom.s"
+	.include "data/scripts/maps/EverGrandeCity_PhoebesRoom.s"
+	.include "data/scripts/maps/EverGrandeCity_GlaciasRoom.s"
+	.include "data/scripts/maps/EverGrandeCity_DrakesRoom.s"
+	.include "data/scripts/maps/EverGrandeCity_ChampionsRoom.s"
+	.include "data/scripts/maps/EverGrandeCity_Corridor1.s"
+	.include "data/scripts/maps/EverGrandeCity_Corridor2.s"
+	.include "data/scripts/maps/EverGrandeCity_Corridor3.s"
+	.include "data/scripts/maps/EverGrandeCity_Corridor4.s"
+	.include "data/scripts/maps/EverGrandeCity_Corridor5.s"
+	.include "data/scripts/maps/EverGrandeCity_PokemonLeague.s"
+	.include "data/scripts/maps/EverGrandeCity_HallOfFame.s"
+	.include "data/scripts/maps/EverGrandeCity_PokemonCenter_1F.s"
+	.include "data/scripts/maps/EverGrandeCity_PokemonCenter_2F.s"
+	.include "data/scripts/maps/Route104_MrBrineysHouse.s"
+	.include "data/scripts/maps/Route104_PrettyPetalFlowerShop.s"
+	.include "data/scripts/maps/Route111_WinstrateFamilysHouse.s"
+	.include "data/scripts/maps/Route111_OldLadysRestStop.s"
+	.include "data/scripts/maps/Route112_CableCarStation.s"
+	.include "data/scripts/maps/MtChimney_CableCarStation.s"
+	.include "data/scripts/maps/Route114_FossilManiacsHouse.s"
+	.include "data/scripts/maps/Route114_FossilManiacsTunnel.s"
+	.include "data/scripts/maps/Route114_LanettesHouse.s"
+	.include "data/scripts/maps/Route116_TunnelersRestHouse.s"
+	.include "data/scripts/maps/Route117_PokemonDayCare.s"
+	.include "data/scripts/maps/Route121_SafariZoneEntrance.s"
+	.include "data/scripts/maps/MeteorFalls_1F_1R.s"
+	.include "data/scripts/maps/MeteorFalls_1F_2R.s"
+	.include "data/scripts/maps/MeteorFalls_B1F_1R.s"
+	.include "data/scripts/maps/MeteorFalls_B1F_2R.s"
+	.include "data/scripts/maps/RusturfTunnel.s"
+	.include "data/scripts/maps/Underwater_SootopolisCity.s"
+	.include "data/scripts/maps/DesertRuins.s"
+	.include "data/scripts/maps/GraniteCave_1F.s"
+	.include "data/scripts/maps/GraniteCave_B1F.s"
+	.include "data/scripts/maps/GraniteCave_B2F.s"
+	.include "data/scripts/maps/GraniteCave_StevensRoom.s"
+	.include "data/scripts/maps/PetalburgWoods.s"
+	.include "data/scripts/maps/MtChimney.s"
+	.include "data/scripts/maps/JaggedPass.s"
+	.include "data/scripts/maps/FieryPath.s"
+	.include "data/scripts/maps/MtPyre_1F.s"
+	.include "data/scripts/maps/MtPyre_2F.s"
+	.include "data/scripts/maps/MtPyre_3F.s"
+	.include "data/scripts/maps/MtPyre_4F.s"
+	.include "data/scripts/maps/MtPyre_5F.s"
+	.include "data/scripts/maps/MtPyre_6F.s"
+	.include "data/scripts/maps/MtPyre_Exterior.s"
+	.include "data/scripts/maps/MtPyre_Summit.s"
+	.include "data/scripts/maps/AquaHideout_1F.s"
+	.include "data/scripts/maps/AquaHideout_B1F.s"
+	.include "data/scripts/maps/AquaHideout_B2F.s"
+	.include "data/scripts/maps/Underwater_SeafloorCavern.s"
+	.include "data/scripts/maps/SeafloorCavern_Entrance.s"
+	.include "data/scripts/maps/SeafloorCavern_Room1.s"
+	.include "data/scripts/maps/SeafloorCavern_Room2.s"
+	.include "data/scripts/maps/SeafloorCavern_Room3.s"
+	.include "data/scripts/maps/SeafloorCavern_Room4.s"
+	.include "data/scripts/maps/SeafloorCavern_Room5.s"
+	.include "data/scripts/maps/SeafloorCavern_Room6.s"
+	.include "data/scripts/maps/SeafloorCavern_Room7.s"
+	.include "data/scripts/maps/SeafloorCavern_Room8.s"
+	.include "data/scripts/maps/SeafloorCavern_Room9.s"
+	.include "data/scripts/maps/CaveOfOrigin_Entrance.s"
+	.include "data/scripts/maps/CaveOfOrigin_1F.s"
+	.include "data/scripts/maps/CaveOfOrigin_B1F.s"
+	.include "data/scripts/maps/CaveOfOrigin_B2F.s"
+	.include "data/scripts/maps/CaveOfOrigin_B3F.s"
+	.include "data/scripts/maps/CaveOfOrigin_B4F.s"
+	.include "data/scripts/maps/VictoryRoad_1F.s"
+	.include "data/scripts/maps/VictoryRoad_B1F.s"
+	.include "data/scripts/maps/VictoryRoad_B2F.s"
+	.include "data/scripts/maps/ShoalCave_LowTideEntranceRoom.s"
+	.include "data/scripts/maps/ShoalCave_LowTideInnerRoom.s"
+	.include "data/scripts/maps/ShoalCave_LowTideStairsRoom.s"
+	.include "data/scripts/maps/ShoalCave_LowTideLowerRoom.s"
+	.include "data/scripts/maps/ShoalCave_HighTideEntranceRoom.s"
+	.include "data/scripts/maps/ShoalCave_HighTideInnerRoom.s"
+	.include "data/scripts/maps/NewMauville_Entrance.s"
+	.include "data/scripts/maps/NewMauville_Inside.s"
+	.include "data/scripts/maps/AbandonedShip_Deck.s"
+	.include "data/scripts/maps/AbandonedShip_Corridors_1F.s"
+	.include "data/scripts/maps/AbandonedShip_Rooms_1F.s"
+	.include "data/scripts/maps/AbandonedShip_Corridors_B1F.s"
+	.include "data/scripts/maps/AbandonedShip_Rooms_B1F.s"
+	.include "data/scripts/maps/AbandonedShip_Rooms2_B1F.s"
+	.include "data/scripts/maps/AbandonedShip_Underwater1.s"
+	.include "data/scripts/maps/AbandonedShip_Room_B1F.s"
+	.include "data/scripts/maps/AbandonedShip_Rooms2_1F.s"
+	.include "data/scripts/maps/AbandonedShip_CaptainsOffice.s"
+	.include "data/scripts/maps/AbandonedShip_Underwater2.s"
+	.include "data/scripts/maps/AbandonedShip_HiddenFloorCorridors.s"
+	.include "data/scripts/maps/AbandonedShip_HiddenFloorRooms.s"
+	.include "data/scripts/maps/IslandCave.s"
+	.include "data/scripts/maps/AncientTomb.s"
+	.include "data/scripts/maps/Underwater_Route134.s"
+	.include "data/scripts/maps/Underwater_SealedChamber.s"
+	.include "data/scripts/maps/SealedChamber_OuterRoom.s"
+	.include "data/scripts/maps/SealedChamber_InnerRoom.s"
+	.include "data/scripts/maps/ScorchedSlab.s"
+	.include "data/scripts/maps/MagmaHideout_1F.s"
+	.include "data/scripts/maps/MagmaHideout_B1F.s"
+	.include "data/scripts/maps/MagmaHideout_B2F.s"
+	.include "data/scripts/maps/SkyPillar_Entrance.s"
+	.include "data/scripts/maps/SkyPillar_Outside.s"
+	.include "data/scripts/maps/SkyPillar_1F.s"
+	.include "data/scripts/maps/SkyPillar_2F.s"
+	.include "data/scripts/maps/SkyPillar_3F.s"
+	.include "data/scripts/maps/SkyPillar_4F.s"
+	.include "data/scripts/maps/ShoalCave_LowTideIceRoom.s"
+	.include "data/scripts/maps/SkyPillar_5F.s"
+	.include "data/scripts/maps/SkyPillar_Top.s"
+	.include "data/scripts/maps/SecretBase_BlueCave1.s"
+	.include "data/scripts/maps/SecretBase_BlueCave2.s"
+	.include "data/scripts/maps/SecretBase_BlueCave3.s"
+	.include "data/scripts/maps/SecretBase_BlueCave4.s"
+	.include "data/scripts/maps/SecretBase_BrownCave1.s"
+	.include "data/scripts/maps/SecretBase_BrownCave2.s"
+	.include "data/scripts/maps/SecretBase_BrownCave3.s"
+	.include "data/scripts/maps/SecretBase_BrownCave4.s"
+	.include "data/scripts/maps/SecretBase_RedCave1.s"
+	.include "data/scripts/maps/SecretBase_RedCave2.s"
+	.include "data/scripts/maps/SecretBase_RedCave3.s"
+	.include "data/scripts/maps/SecretBase_RedCave4.s"
+	.include "data/scripts/maps/SecretBase_Shrub1.s"
+	.include "data/scripts/maps/SecretBase_Shrub2.s"
+	.include "data/scripts/maps/SecretBase_Shrub3.s"
+	.include "data/scripts/maps/SecretBase_Shrub4.s"
+	.include "data/scripts/maps/SecretBase_Tree1.s"
+	.include "data/scripts/maps/SecretBase_Tree2.s"
+	.include "data/scripts/maps/SecretBase_Tree3.s"
+	.include "data/scripts/maps/SecretBase_Tree4.s"
+	.include "data/scripts/maps/SecretBase_YellowCave1.s"
+	.include "data/scripts/maps/SecretBase_YellowCave2.s"
+	.include "data/scripts/maps/SecretBase_YellowCave3.s"
+	.include "data/scripts/maps/SecretBase_YellowCave4.s"
 
 gUnknown_0815F36C:: @ 815F36C
 	lockall
@@ -546,306 +546,306 @@ EventScript_15F573:
 	msgbox UnknownString_81A3C31, 3
 	end
 
-	.include "data/maps/scripts/SingleBattleColosseum.s"
-	.include "data/maps/scripts/TradeCenter.s"
-	.include "data/maps/scripts/RecordCorner.s"
-	.include "data/maps/scripts/DoubleBattleColosseum.s"
-	.include "data/maps/scripts/LinkContestRoom1.s"
-	.include "data/maps/scripts/LinkContestRoom2.s"
-	.include "data/maps/scripts/LinkContestRoom3.s"
-	.include "data/maps/scripts/LinkContestRoom4.s"
-	.include "data/maps/scripts/LinkContestRoom5.s"
-	.include "data/maps/scripts/LinkContestRoom6.s"
-	.include "data/maps/scripts/UnknownMap_25_29.s"
-	.include "data/maps/scripts/UnknownMap_25_30.s"
-	.include "data/maps/scripts/UnknownMap_25_31.s"
-	.include "data/maps/scripts/UnknownMap_25_32.s"
-	.include "data/maps/scripts/UnknownMap_25_33.s"
-	.include "data/maps/scripts/UnknownMap_25_34.s"
-	.include "data/maps/scripts/InsideOfTruck.s"
-	.include "data/maps/scripts/SSTidalCorridor.s"
-	.include "data/maps/scripts/SSTidalLowerDeck.s"
-	.include "data/maps/scripts/SSTidalRooms.s"
-	.include "data/maps/scripts/SafariZone_Northwest.s"
-	.include "data/maps/scripts/SafariZone_Northeast.s"
-	.include "data/maps/scripts/SafariZone_Southwest.s"
-	.include "data/maps/scripts/SafariZone_Southeast.s"
-	.include "data/maps/scripts/BattleTower_Outside.s"
-	.include "data/maps/scripts/BattleTower_Lobby.s"
-	.include "data/maps/scripts/BattleTower_Elevator.s"
-	.include "data/maps/scripts/BattleTower_Corridor.s"
-	.include "data/maps/scripts/BattleTower_BattleRoom.s"
-	.include "data/maps/scripts/SouthernIsland_Exterior.s"
-	.include "data/maps/scripts/SouthernIsland_Interior.s"
-	.include "data/maps/scripts/SafariZone_RestHouse.s"
-	.include "data/maps/scripts/Route104_Prototype.s"
-	.include "data/maps/scripts/Route104_PrototypePrettyPetalFlowerShop.s"
-	.include "data/maps/scripts/Route109_SeashoreHouse.s"
-	.include "data/maps/scripts/Route110_TrickHouseEntrance.s"
-	.include "data/maps/scripts/Route110_TrickHouseEnd.s"
-	.include "data/maps/scripts/Route110_TrickHouseCorridor.s"
-	.include "data/maps/scripts/Route110_TrickHousePuzzle1.s"
-	.include "data/maps/scripts/Route110_TrickHousePuzzle2.s"
-	.include "data/maps/scripts/Route110_TrickHousePuzzle3.s"
-	.include "data/maps/scripts/Route110_TrickHousePuzzle4.s"
-	.include "data/maps/scripts/Route110_TrickHousePuzzle5.s"
-	.include "data/maps/scripts/Route110_TrickHousePuzzle6.s"
-	.include "data/maps/scripts/Route110_TrickHousePuzzle7.s"
-	.include "data/maps/scripts/Route110_TrickHousePuzzle8.s"
-	.include "data/maps/scripts/Route110_SeasideCyclingRoadSouthEntrance.s"
-	.include "data/maps/scripts/Route110_SeasideCyclingRoadNorthEntrance.s"
-	.include "data/maps/scripts/Route113_GlassWorkshop.s"
-	.include "data/maps/scripts/Route123_BerryMastersHouse.s"
-	.include "data/maps/scripts/Route119_WeatherInstitute_1F.s"
-	.include "data/maps/scripts/Route119_WeatherInstitute_2F.s"
-	.include "data/maps/scripts/Route119_House.s"
-	.include "data/maps/scripts/Route124_DivingTreasureHuntersHouse.s"
-
-	.include "data/maps/text/PetalburgCity.s"
-	.include "data/maps/text/SlateportCity.s"
-	.include "data/maps/text/MauvilleCity.s"
-	.include "data/maps/text/RustboroCity.s"
-	.include "data/maps/text/FortreeCity.s"
-	.include "data/maps/text/LilycoveCity.s"
-	.include "data/maps/text/MossdeepCity.s"
-	.include "data/maps/text/SootopolisCity.s"
-	.include "data/maps/text/EverGrandeCity.s"
-	.include "data/maps/text/LittlerootTown.s"
-	.include "data/maps/text/OldaleTown.s"
-	.include "data/maps/text/DewfordTown.s"
-	.include "data/maps/text/LavaridgeTown.s"
-	.include "data/maps/text/FallarborTown.s"
-	.include "data/maps/text/VerdanturfTown.s"
-	.include "data/maps/text/PacifidlogTown.s"
-	.include "data/maps/text/Route101.s"
-	.include "data/maps/text/Route102.s"
-	.include "data/maps/text/Route103.s"
-	.include "data/maps/text/Route104.s"
-	.include "data/maps/text/Route105.s"
-	.include "data/maps/text/Route106.s"
-	.include "data/maps/text/Route107.s"
-	.include "data/maps/text/Route108.s"
-	.include "data/maps/text/Route109.s"
-	.include "data/maps/text/Route110.s"
-	.include "data/maps/text/Route111.s"
-	.include "data/maps/text/Route112.s"
-	.include "data/maps/text/Route113.s"
-	.include "data/maps/text/Route114.s"
-	.include "data/maps/text/Route115.s"
-	.include "data/maps/text/Route116.s"
-	.include "data/maps/text/Route117.s"
-	.include "data/maps/text/Route118.s"
-	.include "data/maps/text/Route119.s"
-	.include "data/maps/text/Route120.s"
-	.include "data/maps/text/Route121.s"
-	.include "data/maps/text/Route123.s"
-	.include "data/maps/text/Route124.s"
-	.include "data/maps/text/Route128.s"
-	.include "data/maps/text/LittlerootTown_BrendansHouse_1F.s"
-	.include "data/maps/text/LittlerootTown_BrendansHouse_2F.s"
-	.include "data/maps/text/LittlerootTown_MaysHouse_1F.s"
-	.include "data/maps/text/LittlerootTown_MaysHouse_2F.s"
-	.include "data/maps/text/LittlerootTown_ProfessorBirchsLab.s"
-	.include "data/maps/text/OldaleTown_House1.s"
-	.include "data/maps/text/OldaleTown_House2.s"
-	.include "data/maps/text/OldaleTown_PokemonCenter_1F.s"
-	.include "data/maps/text/OldaleTown_Mart.s"
-	.include "data/maps/text/DewfordTown_House1.s"
-	.include "data/maps/text/DewfordTown_PokemonCenter_1F.s"
-	.include "data/maps/text/DewfordTown_Gym.s"
-	.include "data/maps/text/DewfordTown_Hall.s"
-	.include "data/maps/text/DewfordTown_House2.s"
-	.include "data/maps/text/LavaridgeTown_HerbShop.s"
-	.include "data/maps/text/LavaridgeTown_Gym_1F.s"
-	.include "data/maps/text/LavaridgeTown_House.s"
-	.include "data/maps/text/LavaridgeTown_Mart.s"
-	.include "data/maps/text/LavaridgeTown_PokemonCenter_1F.s"
-	.include "data/maps/text/FallarborTown_Mart.s"
-	.include "data/maps/text/FallarborTown_ContestLobby.s"
-	.include "data/maps/text/FallarborTown_ContestHall.s"
-	.include "data/maps/text/FallarborTown_PokemonCenter_1F.s"
-	.include "data/maps/text/FallarborTown_House1.s"
-	.include "data/maps/text/FallarborTown_House2.s"
-	.include "data/maps/text/VerdanturfTown_ContestLobby.s"
-	.include "data/maps/text/VerdanturfTown_ContestHall.s"
-	.include "data/maps/text/VerdanturfTown_Mart.s"
-	.include "data/maps/text/VerdanturfTown_PokemonCenter_1F.s"
-	.include "data/maps/text/VerdanturfTown_WandasHouse.s"
-	.include "data/maps/text/VerdanturfTown_FriendshipRatersHouse.s"
-	.include "data/maps/text/VerdanturfTown_House.s"
-	.include "data/maps/text/PacifidlogTown_PokemonCenter_1F.s"
-	.include "data/maps/text/PacifidlogTown_House1.s"
-	.include "data/maps/text/PacifidlogTown_House2.s"
-	.include "data/maps/text/PacifidlogTown_House3.s"
-	.include "data/maps/text/PacifidlogTown_House4.s"
-	.include "data/maps/text/PacifidlogTown_House5.s"
-	.include "data/maps/text/PetalburgCity_WallysHouse.s"
-	.include "data/maps/text/PetalburgCity_Gym.s"
-	.include "data/maps/text/PetalburgCity_House1.s"
-	.include "data/maps/text/PetalburgCity_House2.s"
-	.include "data/maps/text/PetalburgCity_PokemonCenter_1F.s"
-	.include "data/maps/text/PetalburgCity_Mart.s"
-	.include "data/maps/text/SlateportCity_SternsShipyard_1F.s"
-	.include "data/maps/text/SlateportCity_SternsShipyard_2F.s"
-	.include "data/maps/text/SlateportCity_ContestLobby.s"
-	.include "data/maps/text/SlateportCity_ContestHall.s"
-	.include "data/maps/text/SlateportCity_House1.s"
-	.include "data/maps/text/SlateportCity_PokemonFanClub.s"
-	.include "data/maps/text/SlateportCity_OceanicMuseum_1F.s"
-	.include "data/maps/text/SlateportCity_OceanicMuseum_2F.s"
-	.include "data/maps/text/SlateportCity_Harbor.s"
-	.include "data/maps/text/SlateportCity_House2.s"
-	.include "data/maps/text/SlateportCity_PokemonCenter_1F.s"
-	.include "data/maps/text/SlateportCity_Mart.s"
-	.include "data/maps/text/MauvilleCity_Gym.s"
-	.include "data/maps/text/MauvilleCity_BikeShop.s"
-	.include "data/maps/text/MauvilleCity_House1.s"
-	.include "data/maps/text/MauvilleCity_GameCorner.s"
-	.include "data/maps/text/MauvilleCity_House2.s"
-	.include "data/maps/text/MauvilleCity_PokemonCenter_1F.s"
-	.include "data/maps/text/MauvilleCity_PokemonCenter_2F.s"
-	.include "data/maps/text/MauvilleCity_Mart.s"
-	.include "data/maps/text/RustboroCity_DevonCorp_1F.s"
-	.include "data/maps/text/RustboroCity_DevonCorp_2F.s"
-	.include "data/maps/text/RustboroCity_DevonCorp_3F.s"
-	.include "data/maps/text/RustboroCity_Gym.s"
-	.include "data/maps/text/RustboroCity_PokemonSchool.s"
-	.include "data/maps/text/RustboroCity_PokemonCenter_1F.s"
-	.include "data/maps/text/RustboroCity_Mart.s"
-	.include "data/maps/text/RustboroCity_Flat1_1F.s"
-	.include "data/maps/text/RustboroCity_Flat1_2F.s"
-	.include "data/maps/text/RustboroCity_House1.s"
-	.include "data/maps/text/RustboroCity_CuttersHouse.s"
-	.include "data/maps/text/RustboroCity_House2.s"
-	.include "data/maps/text/RustboroCity_Flat2_1F.s"
-	.include "data/maps/text/RustboroCity_Flat2_2F.s"
-	.include "data/maps/text/RustboroCity_Flat2_3F.s"
-	.include "data/maps/text/RustboroCity_House3.s"
-	.include "data/maps/text/FortreeCity_House1.s"
-	.include "data/maps/text/FortreeCity_Gym.s"
-	.include "data/maps/text/FortreeCity_PokemonCenter_1F.s"
-	.include "data/maps/text/FortreeCity_Mart.s"
-	.include "data/maps/text/FortreeCity_House2.s"
-	.include "data/maps/text/FortreeCity_House3.s"
-	.include "data/maps/text/FortreeCity_House4.s"
-	.include "data/maps/text/FortreeCity_House5.s"
-	.include "data/maps/text/FortreeCity_DecorationShop.s"
-	.include "data/maps/text/LilycoveCity_CoveLilyMotel_1F.s"
-	.include "data/maps/text/LilycoveCity_CoveLilyMotel_2F.s"
-	.include "data/maps/text/LilycoveCity_LilycoveMuseum_1F.s"
-	.include "data/maps/text/LilycoveCity_LilycoveMuseum_2F.s"
-	.include "data/maps/text/LilycoveCity_ContestLobby.s"
-	.include "data/maps/text/LilycoveCity_ContestHall.s"
-	.include "data/maps/text/LilycoveCity_PokemonCenter_1F.s"
-	.include "data/maps/text/LilycoveCity_PokemonTrainerFanClub.s"
-	.include "data/maps/text/LilycoveCity_Harbor.s"
-	.include "data/maps/text/LilycoveCity_MoveDeletersHouse.s"
-	.include "data/maps/text/LilycoveCity_House1.s"
-	.include "data/maps/text/LilycoveCity_House2.s"
-	.include "data/maps/text/LilycoveCity_House3.s"
-	.include "data/maps/text/LilycoveCity_House4.s"
-	.include "data/maps/text/LilycoveCity_DepartmentStore_1F.s"
-	.include "data/maps/text/LilycoveCity_DepartmentStore_2F.s"
-	.include "data/maps/text/LilycoveCity_DepartmentStore_3F.s"
-	.include "data/maps/text/LilycoveCity_DepartmentStore_4F.s"
-	.include "data/maps/text/LilycoveCity_DepartmentStore_5F.s"
-	.include "data/maps/text/LilycoveCity_DepartmentStoreRooftop.s"
-	.include "data/maps/text/MossdeepCity_Gym.s"
-	.include "data/maps/text/MossdeepCity_House1.s"
-	.include "data/maps/text/MossdeepCity_House2.s"
-	.include "data/maps/text/MossdeepCity_PokemonCenter_1F.s"
-	.include "data/maps/text/MossdeepCity_PokemonCenter_2F.s"
-	.include "data/maps/text/MossdeepCity_Mart.s"
-	.include "data/maps/text/MossdeepCity_House3.s"
-	.include "data/maps/text/MossdeepCity_StevensHouse.s"
-	.include "data/maps/text/MossdeepCity_House4.s"
-	.include "data/maps/text/MossdeepCity_SpaceCenter_1F.s"
-	.include "data/maps/text/MossdeepCity_SpaceCenter_2F.s"
-	.include "data/maps/text/MossdeepCity_GameCorner_1F.s"
-	.include "data/maps/text/MossdeepCity_GameCorner_B1F.s"
-	.include "data/maps/text/SootopolisCity_Gym_1F.s"
-	.include "data/maps/text/SootopolisCity_Gym_B1F.s"
-	.include "data/maps/text/SootopolisCity_PokemonCenter_1F.s"
-	.include "data/maps/text/SootopolisCity_Mart.s"
-	.include "data/maps/text/SootopolisCity_House1.s"
-	.include "data/maps/text/SootopolisCity_House2.s"
-	.include "data/maps/text/SootopolisCity_House3.s"
-	.include "data/maps/text/SootopolisCity_House4.s"
-	.include "data/maps/text/SootopolisCity_House5.s"
-	.include "data/maps/text/SootopolisCity_House6.s"
-	.include "data/maps/text/SootopolisCity_House7.s"
-	.include "data/maps/text/SootopolisCity_House8.s"
-	.include "data/maps/text/EverGrandeCity_SidneysRoom.s"
-	.include "data/maps/text/EverGrandeCity_PhoebesRoom.s"
-	.include "data/maps/text/EverGrandeCity_GlaciasRoom.s"
-	.include "data/maps/text/EverGrandeCity_DrakesRoom.s"
-	.include "data/maps/text/EverGrandeCity_ChampionsRoom.s"
-	.include "data/maps/text/EverGrandeCity_PokemonLeague.s"
-	.include "data/maps/text/EverGrandeCity_HallOfFame.s"
-	.include "data/maps/text/EverGrandeCity_PokemonCenter_1F.s"
-	.include "data/maps/text/Route104_MrBrineysHouse.s"
-	.include "data/maps/text/Route111_WinstrateFamilysHouse.s"
-	.include "data/maps/text/Route111_OldLadysRestStop.s"
-	.include "data/maps/text/Route112_CableCarStation.s"
-	.include "data/maps/text/MtChimney_CableCarStation.s"
-	.include "data/maps/text/Route114_FossilManiacsHouse.s"
-	.include "data/maps/text/Route114_FossilManiacsTunnel.s"
-	.include "data/maps/text/Route114_LanettesHouse.s"
-	.include "data/maps/text/Route116_TunnelersRestHouse.s"
-	.include "data/maps/text/MeteorFalls_1F_1R.s"
-	.include "data/maps/text/MeteorFalls_1F_2R.s"
-	.include "data/maps/text/RusturfTunnel.s"
-	.include "data/maps/text/GraniteCave_1F.s"
-	.include "data/maps/text/GraniteCave_StevensRoom.s"
-	.include "data/maps/text/PetalburgWoods.s"
-	.include "data/maps/text/MtChimney.s"
-	.include "data/maps/text/JaggedPass.s"
-	.include "data/maps/text/MtPyre_1F.s"
-	.include "data/maps/text/MtPyre_2F.s"
-	.include "data/maps/text/MtPyre_3F.s"
-	.include "data/maps/text/MtPyre_4F.s"
-	.include "data/maps/text/MtPyre_5F.s"
-	.include "data/maps/text/MtPyre_6F.s"
-	.include "data/maps/text/AquaHideout_1F.s"
-	.include "data/maps/text/AquaHideout_B1F.s"
-	.include "data/maps/text/AquaHideout_B2F.s"
-	.include "data/maps/text/Underwater_SeafloorCavern.s"
-	.include "data/maps/text/SeafloorCavern_Room1.s"
-	.include "data/maps/text/SeafloorCavern_Room3.s"
-	.include "data/maps/text/SeafloorCavern_Room4.s"
-	.include "data/maps/text/VictoryRoad_1F.s"
-	.include "data/maps/text/VictoryRoad_B1F.s"
-	.include "data/maps/text/VictoryRoad_B2F.s"
-	.include "data/maps/text/ShoalCave_LowTideEntranceRoom.s"
-	.include "data/maps/text/ShoalCave_LowTideInnerRoom.s"
-	.include "data/maps/text/ShoalCave_LowTideStairsRoom.s"
-	.include "data/maps/text/ShoalCave_LowTideLowerRoom.s"
-	.include "data/maps/text/NewMauville_Entrance.s"
-	.include "data/maps/text/NewMauville_Inside.s"
-	.include "data/maps/text/AbandonedShip_Corridors_1F.s"
-	.include "data/maps/text/AbandonedShip_Rooms_1F.s"
-	.include "data/maps/text/AbandonedShip_Corridors_B1F.s"
-	.include "data/maps/text/AbandonedShip_HiddenFloorCorridors.s"
-	.include "data/maps/text/AbandonedShip_Rooms_B1F.s"
-	.include "data/maps/text/AbandonedShip_Rooms2_B1F.s"
-	.include "data/maps/text/AbandonedShip_Rooms2_1F.s"
-	.include "data/maps/text/AbandonedShip_CaptainsOffice.s"
-	.include "data/maps/text/AbandonedShip_HiddenFloorRooms.s"
-	.include "data/maps/text/SecretBase_RedCave1.s"
-	.include "data/maps/text/InsideOfTruck.s"
-	.include "data/maps/text/SSTidalCorridor.s"
-	.include "data/maps/text/SSTidalLowerDeck.s"
-	.include "data/maps/text/SSTidalRooms.s"
-	.include "data/maps/text/BattleTower_Outside.s"
-	.include "data/maps/text/BattleTower_Lobby.s"
-	.include "data/maps/text/BattleTower_BattleRoom.s"
-	.include "data/maps/text/SouthernIsland_Exterior.s"
-	.include "data/maps/text/SouthernIsland_Interior.s"
-	.include "data/maps/text/SafariZone_RestHouse.s"
-	.include "data/maps/text/Route104_Prototype.s"
-	.include "data/maps/text/Route104_PrototypePrettyPetalFlowerShop.s"
-	.include "data/maps/text/Route109_SeashoreHouse.s"
-	.include "data/maps/text/Route110_TrickHouseEntrance.s"
+	.include "data/scripts/maps/SingleBattleColosseum.s"
+	.include "data/scripts/maps/TradeCenter.s"
+	.include "data/scripts/maps/RecordCorner.s"
+	.include "data/scripts/maps/DoubleBattleColosseum.s"
+	.include "data/scripts/maps/LinkContestRoom1.s"
+	.include "data/scripts/maps/LinkContestRoom2.s"
+	.include "data/scripts/maps/LinkContestRoom3.s"
+	.include "data/scripts/maps/LinkContestRoom4.s"
+	.include "data/scripts/maps/LinkContestRoom5.s"
+	.include "data/scripts/maps/LinkContestRoom6.s"
+	.include "data/scripts/maps/UnknownMap_25_29.s"
+	.include "data/scripts/maps/UnknownMap_25_30.s"
+	.include "data/scripts/maps/UnknownMap_25_31.s"
+	.include "data/scripts/maps/UnknownMap_25_32.s"
+	.include "data/scripts/maps/UnknownMap_25_33.s"
+	.include "data/scripts/maps/UnknownMap_25_34.s"
+	.include "data/scripts/maps/InsideOfTruck.s"
+	.include "data/scripts/maps/SSTidalCorridor.s"
+	.include "data/scripts/maps/SSTidalLowerDeck.s"
+	.include "data/scripts/maps/SSTidalRooms.s"
+	.include "data/scripts/maps/SafariZone_Northwest.s"
+	.include "data/scripts/maps/SafariZone_Northeast.s"
+	.include "data/scripts/maps/SafariZone_Southwest.s"
+	.include "data/scripts/maps/SafariZone_Southeast.s"
+	.include "data/scripts/maps/BattleTower_Outside.s"
+	.include "data/scripts/maps/BattleTower_Lobby.s"
+	.include "data/scripts/maps/BattleTower_Elevator.s"
+	.include "data/scripts/maps/BattleTower_Corridor.s"
+	.include "data/scripts/maps/BattleTower_BattleRoom.s"
+	.include "data/scripts/maps/SouthernIsland_Exterior.s"
+	.include "data/scripts/maps/SouthernIsland_Interior.s"
+	.include "data/scripts/maps/SafariZone_RestHouse.s"
+	.include "data/scripts/maps/Route104_Prototype.s"
+	.include "data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.s"
+	.include "data/scripts/maps/Route109_SeashoreHouse.s"
+	.include "data/scripts/maps/Route110_TrickHouseEntrance.s"
+	.include "data/scripts/maps/Route110_TrickHouseEnd.s"
+	.include "data/scripts/maps/Route110_TrickHouseCorridor.s"
+	.include "data/scripts/maps/Route110_TrickHousePuzzle1.s"
+	.include "data/scripts/maps/Route110_TrickHousePuzzle2.s"
+	.include "data/scripts/maps/Route110_TrickHousePuzzle3.s"
+	.include "data/scripts/maps/Route110_TrickHousePuzzle4.s"
+	.include "data/scripts/maps/Route110_TrickHousePuzzle5.s"
+	.include "data/scripts/maps/Route110_TrickHousePuzzle6.s"
+	.include "data/scripts/maps/Route110_TrickHousePuzzle7.s"
+	.include "data/scripts/maps/Route110_TrickHousePuzzle8.s"
+	.include "data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.s"
+	.include "data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.s"
+	.include "data/scripts/maps/Route113_GlassWorkshop.s"
+	.include "data/scripts/maps/Route123_BerryMastersHouse.s"
+	.include "data/scripts/maps/Route119_WeatherInstitute_1F.s"
+	.include "data/scripts/maps/Route119_WeatherInstitute_2F.s"
+	.include "data/scripts/maps/Route119_House.s"
+	.include "data/scripts/maps/Route124_DivingTreasureHuntersHouse.s"
+
+	.include "data/text/maps/PetalburgCity.s"
+	.include "data/text/maps/SlateportCity.s"
+	.include "data/text/maps/MauvilleCity.s"
+	.include "data/text/maps/RustboroCity.s"
+	.include "data/text/maps/FortreeCity.s"
+	.include "data/text/maps/LilycoveCity.s"
+	.include "data/text/maps/MossdeepCity.s"
+	.include "data/text/maps/SootopolisCity.s"
+	.include "data/text/maps/EverGrandeCity.s"
+	.include "data/text/maps/LittlerootTown.s"
+	.include "data/text/maps/OldaleTown.s"
+	.include "data/text/maps/DewfordTown.s"
+	.include "data/text/maps/LavaridgeTown.s"
+	.include "data/text/maps/FallarborTown.s"
+	.include "data/text/maps/VerdanturfTown.s"
+	.include "data/text/maps/PacifidlogTown.s"
+	.include "data/text/maps/Route101.s"
+	.include "data/text/maps/Route102.s"
+	.include "data/text/maps/Route103.s"
+	.include "data/text/maps/Route104.s"
+	.include "data/text/maps/Route105.s"
+	.include "data/text/maps/Route106.s"
+	.include "data/text/maps/Route107.s"
+	.include "data/text/maps/Route108.s"
+	.include "data/text/maps/Route109.s"
+	.include "data/text/maps/Route110.s"
+	.include "data/text/maps/Route111.s"
+	.include "data/text/maps/Route112.s"
+	.include "data/text/maps/Route113.s"
+	.include "data/text/maps/Route114.s"
+	.include "data/text/maps/Route115.s"
+	.include "data/text/maps/Route116.s"
+	.include "data/text/maps/Route117.s"
+	.include "data/text/maps/Route118.s"
+	.include "data/text/maps/Route119.s"
+	.include "data/text/maps/Route120.s"
+	.include "data/text/maps/Route121.s"
+	.include "data/text/maps/Route123.s"
+	.include "data/text/maps/Route124.s"
+	.include "data/text/maps/Route128.s"
+	.include "data/text/maps/LittlerootTown_BrendansHouse_1F.s"
+	.include "data/text/maps/LittlerootTown_BrendansHouse_2F.s"
+	.include "data/text/maps/LittlerootTown_MaysHouse_1F.s"
+	.include "data/text/maps/LittlerootTown_MaysHouse_2F.s"
+	.include "data/text/maps/LittlerootTown_ProfessorBirchsLab.s"
+	.include "data/text/maps/OldaleTown_House1.s"
+	.include "data/text/maps/OldaleTown_House2.s"
+	.include "data/text/maps/OldaleTown_PokemonCenter_1F.s"
+	.include "data/text/maps/OldaleTown_Mart.s"
+	.include "data/text/maps/DewfordTown_House1.s"
+	.include "data/text/maps/DewfordTown_PokemonCenter_1F.s"
+	.include "data/text/maps/DewfordTown_Gym.s"
+	.include "data/text/maps/DewfordTown_Hall.s"
+	.include "data/text/maps/DewfordTown_House2.s"
+	.include "data/text/maps/LavaridgeTown_HerbShop.s"
+	.include "data/text/maps/LavaridgeTown_Gym_1F.s"
+	.include "data/text/maps/LavaridgeTown_House.s"
+	.include "data/text/maps/LavaridgeTown_Mart.s"
+	.include "data/text/maps/LavaridgeTown_PokemonCenter_1F.s"
+	.include "data/text/maps/FallarborTown_Mart.s"
+	.include "data/text/maps/FallarborTown_ContestLobby.s"
+	.include "data/text/maps/FallarborTown_ContestHall.s"
+	.include "data/text/maps/FallarborTown_PokemonCenter_1F.s"
+	.include "data/text/maps/FallarborTown_House1.s"
+	.include "data/text/maps/FallarborTown_House2.s"
+	.include "data/text/maps/VerdanturfTown_ContestLobby.s"
+	.include "data/text/maps/VerdanturfTown_ContestHall.s"
+	.include "data/text/maps/VerdanturfTown_Mart.s"
+	.include "data/text/maps/VerdanturfTown_PokemonCenter_1F.s"
+	.include "data/text/maps/VerdanturfTown_WandasHouse.s"
+	.include "data/text/maps/VerdanturfTown_FriendshipRatersHouse.s"
+	.include "data/text/maps/VerdanturfTown_House.s"
+	.include "data/text/maps/PacifidlogTown_PokemonCenter_1F.s"
+	.include "data/text/maps/PacifidlogTown_House1.s"
+	.include "data/text/maps/PacifidlogTown_House2.s"
+	.include "data/text/maps/PacifidlogTown_House3.s"
+	.include "data/text/maps/PacifidlogTown_House4.s"
+	.include "data/text/maps/PacifidlogTown_House5.s"
+	.include "data/text/maps/PetalburgCity_WallysHouse.s"
+	.include "data/text/maps/PetalburgCity_Gym.s"
+	.include "data/text/maps/PetalburgCity_House1.s"
+	.include "data/text/maps/PetalburgCity_House2.s"
+	.include "data/text/maps/PetalburgCity_PokemonCenter_1F.s"
+	.include "data/text/maps/PetalburgCity_Mart.s"
+	.include "data/text/maps/SlateportCity_SternsShipyard_1F.s"
+	.include "data/text/maps/SlateportCity_SternsShipyard_2F.s"
+	.include "data/text/maps/SlateportCity_ContestLobby.s"
+	.include "data/text/maps/SlateportCity_ContestHall.s"
+	.include "data/text/maps/SlateportCity_House1.s"
+	.include "data/text/maps/SlateportCity_PokemonFanClub.s"
+	.include "data/text/maps/SlateportCity_OceanicMuseum_1F.s"
+	.include "data/text/maps/SlateportCity_OceanicMuseum_2F.s"
+	.include "data/text/maps/SlateportCity_Harbor.s"
+	.include "data/text/maps/SlateportCity_House2.s"
+	.include "data/text/maps/SlateportCity_PokemonCenter_1F.s"
+	.include "data/text/maps/SlateportCity_Mart.s"
+	.include "data/text/maps/MauvilleCity_Gym.s"
+	.include "data/text/maps/MauvilleCity_BikeShop.s"
+	.include "data/text/maps/MauvilleCity_House1.s"
+	.include "data/text/maps/MauvilleCity_GameCorner.s"
+	.include "data/text/maps/MauvilleCity_House2.s"
+	.include "data/text/maps/MauvilleCity_PokemonCenter_1F.s"
+	.include "data/text/maps/MauvilleCity_PokemonCenter_2F.s"
+	.include "data/text/maps/MauvilleCity_Mart.s"
+	.include "data/text/maps/RustboroCity_DevonCorp_1F.s"
+	.include "data/text/maps/RustboroCity_DevonCorp_2F.s"
+	.include "data/text/maps/RustboroCity_DevonCorp_3F.s"
+	.include "data/text/maps/RustboroCity_Gym.s"
+	.include "data/text/maps/RustboroCity_PokemonSchool.s"
+	.include "data/text/maps/RustboroCity_PokemonCenter_1F.s"
+	.include "data/text/maps/RustboroCity_Mart.s"
+	.include "data/text/maps/RustboroCity_Flat1_1F.s"
+	.include "data/text/maps/RustboroCity_Flat1_2F.s"
+	.include "data/text/maps/RustboroCity_House1.s"
+	.include "data/text/maps/RustboroCity_CuttersHouse.s"
+	.include "data/text/maps/RustboroCity_House2.s"
+	.include "data/text/maps/RustboroCity_Flat2_1F.s"
+	.include "data/text/maps/RustboroCity_Flat2_2F.s"
+	.include "data/text/maps/RustboroCity_Flat2_3F.s"
+	.include "data/text/maps/RustboroCity_House3.s"
+	.include "data/text/maps/FortreeCity_House1.s"
+	.include "data/text/maps/FortreeCity_Gym.s"
+	.include "data/text/maps/FortreeCity_PokemonCenter_1F.s"
+	.include "data/text/maps/FortreeCity_Mart.s"
+	.include "data/text/maps/FortreeCity_House2.s"
+	.include "data/text/maps/FortreeCity_House3.s"
+	.include "data/text/maps/FortreeCity_House4.s"
+	.include "data/text/maps/FortreeCity_House5.s"
+	.include "data/text/maps/FortreeCity_DecorationShop.s"
+	.include "data/text/maps/LilycoveCity_CoveLilyMotel_1F.s"
+	.include "data/text/maps/LilycoveCity_CoveLilyMotel_2F.s"
+	.include "data/text/maps/LilycoveCity_LilycoveMuseum_1F.s"
+	.include "data/text/maps/LilycoveCity_LilycoveMuseum_2F.s"
+	.include "data/text/maps/LilycoveCity_ContestLobby.s"
+	.include "data/text/maps/LilycoveCity_ContestHall.s"
+	.include "data/text/maps/LilycoveCity_PokemonCenter_1F.s"
+	.include "data/text/maps/LilycoveCity_PokemonTrainerFanClub.s"
+	.include "data/text/maps/LilycoveCity_Harbor.s"
+	.include "data/text/maps/LilycoveCity_MoveDeletersHouse.s"
+	.include "data/text/maps/LilycoveCity_House1.s"
+	.include "data/text/maps/LilycoveCity_House2.s"
+	.include "data/text/maps/LilycoveCity_House3.s"
+	.include "data/text/maps/LilycoveCity_House4.s"
+	.include "data/text/maps/LilycoveCity_DepartmentStore_1F.s"
+	.include "data/text/maps/LilycoveCity_DepartmentStore_2F.s"
+	.include "data/text/maps/LilycoveCity_DepartmentStore_3F.s"
+	.include "data/text/maps/LilycoveCity_DepartmentStore_4F.s"
+	.include "data/text/maps/LilycoveCity_DepartmentStore_5F.s"
+	.include "data/text/maps/LilycoveCity_DepartmentStoreRooftop.s"
+	.include "data/text/maps/MossdeepCity_Gym.s"
+	.include "data/text/maps/MossdeepCity_House1.s"
+	.include "data/text/maps/MossdeepCity_House2.s"
+	.include "data/text/maps/MossdeepCity_PokemonCenter_1F.s"
+	.include "data/text/maps/MossdeepCity_PokemonCenter_2F.s"
+	.include "data/text/maps/MossdeepCity_Mart.s"
+	.include "data/text/maps/MossdeepCity_House3.s"
+	.include "data/text/maps/MossdeepCity_StevensHouse.s"
+	.include "data/text/maps/MossdeepCity_House4.s"
+	.include "data/text/maps/MossdeepCity_SpaceCenter_1F.s"
+	.include "data/text/maps/MossdeepCity_SpaceCenter_2F.s"
+	.include "data/text/maps/MossdeepCity_GameCorner_1F.s"
+	.include "data/text/maps/MossdeepCity_GameCorner_B1F.s"
+	.include "data/text/maps/SootopolisCity_Gym_1F.s"
+	.include "data/text/maps/SootopolisCity_Gym_B1F.s"
+	.include "data/text/maps/SootopolisCity_PokemonCenter_1F.s"
+	.include "data/text/maps/SootopolisCity_Mart.s"
+	.include "data/text/maps/SootopolisCity_House1.s"
+	.include "data/text/maps/SootopolisCity_House2.s"
+	.include "data/text/maps/SootopolisCity_House3.s"
+	.include "data/text/maps/SootopolisCity_House4.s"
+	.include "data/text/maps/SootopolisCity_House5.s"
+	.include "data/text/maps/SootopolisCity_House6.s"
+	.include "data/text/maps/SootopolisCity_House7.s"
+	.include "data/text/maps/SootopolisCity_House8.s"
+	.include "data/text/maps/EverGrandeCity_SidneysRoom.s"
+	.include "data/text/maps/EverGrandeCity_PhoebesRoom.s"
+	.include "data/text/maps/EverGrandeCity_GlaciasRoom.s"
+	.include "data/text/maps/EverGrandeCity_DrakesRoom.s"
+	.include "data/text/maps/EverGrandeCity_ChampionsRoom.s"
+	.include "data/text/maps/EverGrandeCity_PokemonLeague.s"
+	.include "data/text/maps/EverGrandeCity_HallOfFame.s"
+	.include "data/text/maps/EverGrandeCity_PokemonCenter_1F.s"
+	.include "data/text/maps/Route104_MrBrineysHouse.s"
+	.include "data/text/maps/Route111_WinstrateFamilysHouse.s"
+	.include "data/text/maps/Route111_OldLadysRestStop.s"
+	.include "data/text/maps/Route112_CableCarStation.s"
+	.include "data/text/maps/MtChimney_CableCarStation.s"
+	.include "data/text/maps/Route114_FossilManiacsHouse.s"
+	.include "data/text/maps/Route114_FossilManiacsTunnel.s"
+	.include "data/text/maps/Route114_LanettesHouse.s"
+	.include "data/text/maps/Route116_TunnelersRestHouse.s"
+	.include "data/text/maps/MeteorFalls_1F_1R.s"
+	.include "data/text/maps/MeteorFalls_1F_2R.s"
+	.include "data/text/maps/RusturfTunnel.s"
+	.include "data/text/maps/GraniteCave_1F.s"
+	.include "data/text/maps/GraniteCave_StevensRoom.s"
+	.include "data/text/maps/PetalburgWoods.s"
+	.include "data/text/maps/MtChimney.s"
+	.include "data/text/maps/JaggedPass.s"
+	.include "data/text/maps/MtPyre_1F.s"
+	.include "data/text/maps/MtPyre_2F.s"
+	.include "data/text/maps/MtPyre_3F.s"
+	.include "data/text/maps/MtPyre_4F.s"
+	.include "data/text/maps/MtPyre_5F.s"
+	.include "data/text/maps/MtPyre_6F.s"
+	.include "data/text/maps/AquaHideout_1F.s"
+	.include "data/text/maps/AquaHideout_B1F.s"
+	.include "data/text/maps/AquaHideout_B2F.s"
+	.include "data/text/maps/Underwater_SeafloorCavern.s"
+	.include "data/text/maps/SeafloorCavern_Room1.s"
+	.include "data/text/maps/SeafloorCavern_Room3.s"
+	.include "data/text/maps/SeafloorCavern_Room4.s"
+	.include "data/text/maps/VictoryRoad_1F.s"
+	.include "data/text/maps/VictoryRoad_B1F.s"
+	.include "data/text/maps/VictoryRoad_B2F.s"
+	.include "data/text/maps/ShoalCave_LowTideEntranceRoom.s"
+	.include "data/text/maps/ShoalCave_LowTideInnerRoom.s"
+	.include "data/text/maps/ShoalCave_LowTideStairsRoom.s"
+	.include "data/text/maps/ShoalCave_LowTideLowerRoom.s"
+	.include "data/text/maps/NewMauville_Entrance.s"
+	.include "data/text/maps/NewMauville_Inside.s"
+	.include "data/text/maps/AbandonedShip_Corridors_1F.s"
+	.include "data/text/maps/AbandonedShip_Rooms_1F.s"
+	.include "data/text/maps/AbandonedShip_Corridors_B1F.s"
+	.include "data/text/maps/AbandonedShip_HiddenFloorCorridors.s"
+	.include "data/text/maps/AbandonedShip_Rooms_B1F.s"
+	.include "data/text/maps/AbandonedShip_Rooms2_B1F.s"
+	.include "data/text/maps/AbandonedShip_Rooms2_1F.s"
+	.include "data/text/maps/AbandonedShip_CaptainsOffice.s"
+	.include "data/text/maps/AbandonedShip_HiddenFloorRooms.s"
+	.include "data/text/maps/SecretBase_RedCave1.s"
+	.include "data/text/maps/InsideOfTruck.s"
+	.include "data/text/maps/SSTidalCorridor.s"
+	.include "data/text/maps/SSTidalLowerDeck.s"
+	.include "data/text/maps/SSTidalRooms.s"
+	.include "data/text/maps/BattleTower_Outside.s"
+	.include "data/text/maps/BattleTower_Lobby.s"
+	.include "data/text/maps/BattleTower_BattleRoom.s"
+	.include "data/text/maps/SouthernIsland_Exterior.s"
+	.include "data/text/maps/SouthernIsland_Interior.s"
+	.include "data/text/maps/SafariZone_RestHouse.s"
+	.include "data/text/maps/Route104_Prototype.s"
+	.include "data/text/maps/Route104_PrototypePrettyPetalFlowerShop.s"
+	.include "data/text/maps/Route109_SeashoreHouse.s"
+	.include "data/text/maps/Route110_TrickHouseEntrance.s"
 
 Route110_TrickHousePuzzle1_Text_19C1B8:: @ 819C1B8
 	.string "{PLAYER} found a scroll.$"
@@ -862,23 +862,23 @@ UnknownString_819C21F: @ 819C21F
 	.string "...On closer inspection, this is written\n"
 	.string "on it: “Write the secret code here.”$"
 
-	.include "data/maps/text/Route110_TrickHouseEnd.s"
-	.include "data/maps/text/Route110_TrickHousePuzzle1.s"
-	.include "data/maps/text/Route110_TrickHousePuzzle2.s"
-	.include "data/maps/text/Route110_TrickHousePuzzle3.s"
-	.include "data/maps/text/Route110_TrickHousePuzzle4.s"
-	.include "data/maps/text/Route110_TrickHousePuzzle5.s"
-	.include "data/maps/text/Route110_TrickHousePuzzle6.s"
-	.include "data/maps/text/Route110_TrickHousePuzzle7.s"
-	.include "data/maps/text/Route110_TrickHousePuzzle8.s"
-	.include "data/maps/text/Route110_SeasideCyclingRoadSouthEntrance.s"
-	.include "data/maps/text/Route110_SeasideCyclingRoadNorthEntrance.s"
-	.include "data/maps/text/Route113_GlassWorkshop.s"
-	.include "data/maps/text/Route123_BerryMastersHouse.s"
-	.include "data/maps/text/Route119_WeatherInstitute_1F.s"
-	.include "data/maps/text/Route119_WeatherInstitute_2F.s"
-	.include "data/maps/text/Route119_House.s"
-	.include "data/maps/text/Route124_DivingTreasureHuntersHouse.s"
+	.include "data/text/maps/Route110_TrickHouseEnd.s"
+	.include "data/text/maps/Route110_TrickHousePuzzle1.s"
+	.include "data/text/maps/Route110_TrickHousePuzzle2.s"
+	.include "data/text/maps/Route110_TrickHousePuzzle3.s"
+	.include "data/text/maps/Route110_TrickHousePuzzle4.s"
+	.include "data/text/maps/Route110_TrickHousePuzzle5.s"
+	.include "data/text/maps/Route110_TrickHousePuzzle6.s"
+	.include "data/text/maps/Route110_TrickHousePuzzle7.s"
+	.include "data/text/maps/Route110_TrickHousePuzzle8.s"
+	.include "data/text/maps/Route110_SeasideCyclingRoadSouthEntrance.s"
+	.include "data/text/maps/Route110_SeasideCyclingRoadNorthEntrance.s"
+	.include "data/text/maps/Route113_GlassWorkshop.s"
+	.include "data/text/maps/Route123_BerryMastersHouse.s"
+	.include "data/text/maps/Route119_WeatherInstitute_1F.s"
+	.include "data/text/maps/Route119_WeatherInstitute_2F.s"
+	.include "data/text/maps/Route119_House.s"
+	.include "data/text/maps/Route124_DivingTreasureHuntersHouse.s"
 
 
 Std_2:
@@ -3022,7 +3022,7 @@ MauvilleCity_Mart_Text_1A0C02:: @ 81A0C02
 MossdeepCity_Mart_Text_1A0C02:: @ 81A0C02
 OldaleTown_Mart_Text_1A0C02:: @ 81A0C02
 PetalburgCity_Mart_Text_1A0C02:: @ 81A0C02
-	.include "data/maps/text/Route104_PrettyPetalFlowerShop.s"
+	.include "data/text/maps/Route104_PrettyPetalFlowerShop.s"
 RustboroCity_Mart_Text_1A0C02:: @ 81A0C02
 SlateportCity_Mart_Text_1A0C02:: @ 81A0C02
 SlateportCity_Text_1A0C02:: @ 81A0C02
@@ -3120,7 +3120,7 @@ UnknownString_81A0E68: @ 81A0E68
 UnknownString_81A0ED6: @ 81A0ED6
 	.string "What should I do for fun today?$"
 
-	.include "data/maps/text/LilycoveCity_DepartmentStoreElevator.s"
+	.include "data/text/maps/LilycoveCity_DepartmentStoreElevator.s"
 Route111_Text_1A0F93:: @ 81A0F93
 	.string "The sandstorm is vicious.\n"
 	.string "It’s impossible to keep going.$"
@@ -3187,12 +3187,12 @@ UseSurfPromptText: @ 81A1344
 UsedSurfText: @ 81A137D
 	.string "{STR_VAR_1} used SURF!$"
 
-	.include "data/maps/text/SealedChamber_InnerRoom.s"
-	.include "data/maps/text/AncientTomb.s"
-	.include "data/maps/text/DesertRuins.s"
-	.include "data/maps/text/IslandCave.s"
-	.include "data/maps/text/SealedChamber_OuterRoom.s"
-	.include "data/maps/text/OldaleTown_PokemonCenter_2F.s"
+	.include "data/text/maps/SealedChamber_InnerRoom.s"
+	.include "data/text/maps/AncientTomb.s"
+	.include "data/text/maps/DesertRuins.s"
+	.include "data/text/maps/IslandCave.s"
+	.include "data/text/maps/SealedChamber_OuterRoom.s"
+	.include "data/text/maps/OldaleTown_PokemonCenter_2F.s"
 FallarborTown_House1_Text_1A1498:: @ 81A1498
 	.string "{PLAYER} handed over the\n"
 	.string "{STR_VAR_1}.$"
@@ -5660,9 +5660,9 @@ UnknownString_81A4D45: @ 81A4D45
 	.string "Score! Got to look at {STR_VAR_1}’s\n"
 	.string "TRAINER CARD! It’s a {STR_VAR_2} card!$"
 
-	.include "data/maps/text/SingleBattleColosseum.s"
-	.include "data/maps/text/TradeCenter.s"
-	.include "data/maps/text/RecordCorner.s"
+	.include "data/text/maps/SingleBattleColosseum.s"
+	.include "data/text/maps/TradeCenter.s"
+	.include "data/text/maps/RecordCorner.s"
 OldaleTown_PokemonCenter_2F_Text_1A4E50:: @ 81A4E50
 	.string "The TRAINER CARD data will\n"
 	.string "be rewritten.$"
@@ -7160,7 +7160,7 @@ FallarborTown_ContestLobby_Text_1A68C6:: @ 81A68C6
 	.string "Please come back for your prize\n"
 	.string "later on.$"
 
-	.include "data/maps/text/LinkContestRoom1.s"
+	.include "data/text/maps/LinkContestRoom1.s"
 
 Event_TV:: @ 81A6E72
 	lockall
@@ -10922,7 +10922,7 @@ Route117_Text_1B28C4:: @ 81B28C4
 	.string "I really will keep it.\n"
 	.string "You do want this, yes?$"
 
-	.include "data/maps/text/Route117_PokemonDayCare.s"
+	.include "data/text/maps/Route117_PokemonDayCare.s"
 MtChimney_EventScript_1B2C95:: @ 81B2C95
 	lock
 	faceplayer
@@ -11407,9 +11407,9 @@ UnknownString_81B4818: @ 81B4818
 	.string "MAXIE: {PLAYER}{KUN}, come on, you have\n"
 	.string "to get out of here, too!$"
 
-	.include "data/maps/text/SeafloorCavern_Room9.s"
-	.include "data/maps/text/CaveOfOrigin_B4F.s"
-	.include "data/maps/text/MtPyre_Summit.s"
+	.include "data/text/maps/SeafloorCavern_Room9.s"
+	.include "data/text/maps/CaveOfOrigin_B4F.s"
+	.include "data/text/maps/MtPyre_Summit.s"
 
 gUnknown_081B694A:: @ 81B694A
 	lighten 1
@@ -12509,11 +12509,11 @@ UnknownString_81C35A9: @ 81C35A9
 	.string "The {STR_VAR_1} was placed\n"
 	.string "on the {POKEBLOCK} FEEDER.$"
 
-	.include "data/maps/text/Route121_SafariZoneEntrance.s"
-	.include "data/maps/text/SafariZone_Southeast.s"
-	.include "data/maps/text/SafariZone_Southwest.s"
-	.include "data/maps/text/SafariZone_Northwest.s"
-	.include "data/maps/text/SafariZone_Northeast.s"
+	.include "data/text/maps/Route121_SafariZoneEntrance.s"
+	.include "data/text/maps/SafariZone_Southeast.s"
+	.include "data/text/maps/SafariZone_Southwest.s"
+	.include "data/text/maps/SafariZone_Northwest.s"
+	.include "data/text/maps/SafariZone_Northeast.s"
 SafariZone_Southeast_Text_1C3DCE:: @ 81C3DCE
 	.string "I put a {POKEBLOCK} on the {POKEBLOCK} FEEDER.\n"
 	.string "But it seems to have disappeared.\p"
diff --git a/data/maps/scripts/AbandonedShip_CaptainsOffice.s b/data/scripts/maps/AbandonedShip_CaptainsOffice.s
index 5ad17725b..5ad17725b 100644
--- a/data/maps/scripts/AbandonedShip_CaptainsOffice.s
+++ b/data/scripts/maps/AbandonedShip_CaptainsOffice.s
diff --git a/data/maps/scripts/AbandonedShip_Corridors_1F.s b/data/scripts/maps/AbandonedShip_Corridors_1F.s
index 408299ac4..408299ac4 100644
--- a/data/maps/scripts/AbandonedShip_Corridors_1F.s
+++ b/data/scripts/maps/AbandonedShip_Corridors_1F.s
diff --git a/data/maps/scripts/AbandonedShip_Corridors_B1F.s b/data/scripts/maps/AbandonedShip_Corridors_B1F.s
index 71c3691fe..71c3691fe 100644
--- a/data/maps/scripts/AbandonedShip_Corridors_B1F.s
+++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.s
diff --git a/data/maps/scripts/AbandonedShip_Deck.s b/data/scripts/maps/AbandonedShip_Deck.s
index 605dbae59..605dbae59 100644
--- a/data/maps/scripts/AbandonedShip_Deck.s
+++ b/data/scripts/maps/AbandonedShip_Deck.s
diff --git a/data/maps/scripts/AbandonedShip_HiddenFloorCorridors.s b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.s
index 2b1254a11..2b1254a11 100644
--- a/data/maps/scripts/AbandonedShip_HiddenFloorCorridors.s
+++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.s
diff --git a/data/maps/scripts/AbandonedShip_HiddenFloorRooms.s b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.s
index 8b1e250a6..8b1e250a6 100644
--- a/data/maps/scripts/AbandonedShip_HiddenFloorRooms.s
+++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.s
diff --git a/data/maps/scripts/AbandonedShip_Room_B1F.s b/data/scripts/maps/AbandonedShip_Room_B1F.s
index 92bee6319..92bee6319 100644
--- a/data/maps/scripts/AbandonedShip_Room_B1F.s
+++ b/data/scripts/maps/AbandonedShip_Room_B1F.s
diff --git a/data/maps/scripts/AbandonedShip_Rooms2_1F.s b/data/scripts/maps/AbandonedShip_Rooms2_1F.s
index b059ca4e5..b059ca4e5 100644
--- a/data/maps/scripts/AbandonedShip_Rooms2_1F.s
+++ b/data/scripts/maps/AbandonedShip_Rooms2_1F.s
diff --git a/data/maps/scripts/AbandonedShip_Rooms2_B1F.s b/data/scripts/maps/AbandonedShip_Rooms2_B1F.s
index 18e144a44..18e144a44 100644
--- a/data/maps/scripts/AbandonedShip_Rooms2_B1F.s
+++ b/data/scripts/maps/AbandonedShip_Rooms2_B1F.s
diff --git a/data/maps/scripts/AbandonedShip_Rooms_1F.s b/data/scripts/maps/AbandonedShip_Rooms_1F.s
index dafa5c7bd..dafa5c7bd 100644
--- a/data/maps/scripts/AbandonedShip_Rooms_1F.s
+++ b/data/scripts/maps/AbandonedShip_Rooms_1F.s
diff --git a/data/maps/scripts/AbandonedShip_Rooms_B1F.s b/data/scripts/maps/AbandonedShip_Rooms_B1F.s
index cebcf1b77..cebcf1b77 100644
--- a/data/maps/scripts/AbandonedShip_Rooms_B1F.s
+++ b/data/scripts/maps/AbandonedShip_Rooms_B1F.s
diff --git a/data/maps/scripts/AbandonedShip_Underwater1.s b/data/scripts/maps/AbandonedShip_Underwater1.s
index af7a26580..af7a26580 100644
--- a/data/maps/scripts/AbandonedShip_Underwater1.s
+++ b/data/scripts/maps/AbandonedShip_Underwater1.s
diff --git a/data/maps/scripts/AbandonedShip_Underwater2.s b/data/scripts/maps/AbandonedShip_Underwater2.s
index a4f9d3912..a4f9d3912 100644
--- a/data/maps/scripts/AbandonedShip_Underwater2.s
+++ b/data/scripts/maps/AbandonedShip_Underwater2.s
diff --git a/data/maps/scripts/AncientTomb.s b/data/scripts/maps/AncientTomb.s
index 66cf88a9c..66cf88a9c 100644
--- a/data/maps/scripts/AncientTomb.s
+++ b/data/scripts/maps/AncientTomb.s
diff --git a/data/maps/scripts/AquaHideout_1F.s b/data/scripts/maps/AquaHideout_1F.s
index 5a7b04fda..5a7b04fda 100644
--- a/data/maps/scripts/AquaHideout_1F.s
+++ b/data/scripts/maps/AquaHideout_1F.s
diff --git a/data/maps/scripts/AquaHideout_B1F.s b/data/scripts/maps/AquaHideout_B1F.s
index fe37ddda3..fe37ddda3 100644
--- a/data/maps/scripts/AquaHideout_B1F.s
+++ b/data/scripts/maps/AquaHideout_B1F.s
diff --git a/data/maps/scripts/AquaHideout_B2F.s b/data/scripts/maps/AquaHideout_B2F.s
index a0bf90151..a0bf90151 100644
--- a/data/maps/scripts/AquaHideout_B2F.s
+++ b/data/scripts/maps/AquaHideout_B2F.s
diff --git a/data/maps/scripts/BattleTower_BattleRoom.s b/data/scripts/maps/BattleTower_BattleRoom.s
index 76a1a3194..76a1a3194 100644
--- a/data/maps/scripts/BattleTower_BattleRoom.s
+++ b/data/scripts/maps/BattleTower_BattleRoom.s
diff --git a/data/maps/scripts/BattleTower_Corridor.s b/data/scripts/maps/BattleTower_Corridor.s
index 6dd4adb3d..6dd4adb3d 100644
--- a/data/maps/scripts/BattleTower_Corridor.s
+++ b/data/scripts/maps/BattleTower_Corridor.s
diff --git a/data/maps/scripts/BattleTower_Elevator.s b/data/scripts/maps/BattleTower_Elevator.s
index fab5d010d..fab5d010d 100644
--- a/data/maps/scripts/BattleTower_Elevator.s
+++ b/data/scripts/maps/BattleTower_Elevator.s
diff --git a/data/maps/scripts/BattleTower_Lobby.s b/data/scripts/maps/BattleTower_Lobby.s
index a2fd22b10..a2fd22b10 100644
--- a/data/maps/scripts/BattleTower_Lobby.s
+++ b/data/scripts/maps/BattleTower_Lobby.s
diff --git a/data/maps/scripts/BattleTower_Outside.s b/data/scripts/maps/BattleTower_Outside.s
index 4ff10710f..4ff10710f 100644
--- a/data/maps/scripts/BattleTower_Outside.s
+++ b/data/scripts/maps/BattleTower_Outside.s
diff --git a/data/maps/scripts/CaveOfOrigin_1F.s b/data/scripts/maps/CaveOfOrigin_1F.s
index f55cd5081..f55cd5081 100644
--- a/data/maps/scripts/CaveOfOrigin_1F.s
+++ b/data/scripts/maps/CaveOfOrigin_1F.s
diff --git a/data/maps/scripts/CaveOfOrigin_B1F.s b/data/scripts/maps/CaveOfOrigin_B1F.s
index 751f38659..751f38659 100644
--- a/data/maps/scripts/CaveOfOrigin_B1F.s
+++ b/data/scripts/maps/CaveOfOrigin_B1F.s
diff --git a/data/maps/scripts/CaveOfOrigin_B2F.s b/data/scripts/maps/CaveOfOrigin_B2F.s
index 8c1ba56b8..8c1ba56b8 100644
--- a/data/maps/scripts/CaveOfOrigin_B2F.s
+++ b/data/scripts/maps/CaveOfOrigin_B2F.s
diff --git a/data/maps/scripts/CaveOfOrigin_B3F.s b/data/scripts/maps/CaveOfOrigin_B3F.s
index 2ebdb2d05..2ebdb2d05 100644
--- a/data/maps/scripts/CaveOfOrigin_B3F.s
+++ b/data/scripts/maps/CaveOfOrigin_B3F.s
diff --git a/data/maps/scripts/CaveOfOrigin_B4F.s b/data/scripts/maps/CaveOfOrigin_B4F.s
index b0c638df0..b0c638df0 100644
--- a/data/maps/scripts/CaveOfOrigin_B4F.s
+++ b/data/scripts/maps/CaveOfOrigin_B4F.s
diff --git a/data/maps/scripts/CaveOfOrigin_Entrance.s b/data/scripts/maps/CaveOfOrigin_Entrance.s
index a39a290be..a39a290be 100644
--- a/data/maps/scripts/CaveOfOrigin_Entrance.s
+++ b/data/scripts/maps/CaveOfOrigin_Entrance.s
diff --git a/data/maps/scripts/DesertRuins.s b/data/scripts/maps/DesertRuins.s
index de5658eac..de5658eac 100644
--- a/data/maps/scripts/DesertRuins.s
+++ b/data/scripts/maps/DesertRuins.s
diff --git a/data/maps/scripts/DewfordTown.s b/data/scripts/maps/DewfordTown.s
index 6c184198d..6c184198d 100644
--- a/data/maps/scripts/DewfordTown.s
+++ b/data/scripts/maps/DewfordTown.s
diff --git a/data/maps/scripts/DewfordTown_Gym.s b/data/scripts/maps/DewfordTown_Gym.s
index e51c33c69..e51c33c69 100644
--- a/data/maps/scripts/DewfordTown_Gym.s
+++ b/data/scripts/maps/DewfordTown_Gym.s
diff --git a/data/maps/scripts/DewfordTown_Hall.s b/data/scripts/maps/DewfordTown_Hall.s
index a7dd01c32..a7dd01c32 100644
--- a/data/maps/scripts/DewfordTown_Hall.s
+++ b/data/scripts/maps/DewfordTown_Hall.s
diff --git a/data/maps/scripts/DewfordTown_House1.s b/data/scripts/maps/DewfordTown_House1.s
index fa9e62b12..fa9e62b12 100644
--- a/data/maps/scripts/DewfordTown_House1.s
+++ b/data/scripts/maps/DewfordTown_House1.s
diff --git a/data/maps/scripts/DewfordTown_House2.s b/data/scripts/maps/DewfordTown_House2.s
index 8f1e8c784..8f1e8c784 100644
--- a/data/maps/scripts/DewfordTown_House2.s
+++ b/data/scripts/maps/DewfordTown_House2.s
diff --git a/data/maps/scripts/DewfordTown_PokemonCenter_1F.s b/data/scripts/maps/DewfordTown_PokemonCenter_1F.s
index 687a01ddc..687a01ddc 100644
--- a/data/maps/scripts/DewfordTown_PokemonCenter_1F.s
+++ b/data/scripts/maps/DewfordTown_PokemonCenter_1F.s
diff --git a/data/maps/scripts/DewfordTown_PokemonCenter_2F.s b/data/scripts/maps/DewfordTown_PokemonCenter_2F.s
index 5d23f1f9a..5d23f1f9a 100644
--- a/data/maps/scripts/DewfordTown_PokemonCenter_2F.s
+++ b/data/scripts/maps/DewfordTown_PokemonCenter_2F.s
diff --git a/data/maps/scripts/DoubleBattleColosseum.s b/data/scripts/maps/DoubleBattleColosseum.s
index 360f5fced..360f5fced 100644
--- a/data/maps/scripts/DoubleBattleColosseum.s
+++ b/data/scripts/maps/DoubleBattleColosseum.s
diff --git a/data/maps/scripts/EverGrandeCity.s b/data/scripts/maps/EverGrandeCity.s
index cdac6069e..cdac6069e 100644
--- a/data/maps/scripts/EverGrandeCity.s
+++ b/data/scripts/maps/EverGrandeCity.s
diff --git a/data/maps/scripts/EverGrandeCity_ChampionsRoom.s b/data/scripts/maps/EverGrandeCity_ChampionsRoom.s
index de6c091a5..de6c091a5 100644
--- a/data/maps/scripts/EverGrandeCity_ChampionsRoom.s
+++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.s
diff --git a/data/maps/scripts/EverGrandeCity_Corridor1.s b/data/scripts/maps/EverGrandeCity_Corridor1.s
index a3798d99b..a3798d99b 100644
--- a/data/maps/scripts/EverGrandeCity_Corridor1.s
+++ b/data/scripts/maps/EverGrandeCity_Corridor1.s
diff --git a/data/maps/scripts/EverGrandeCity_Corridor2.s b/data/scripts/maps/EverGrandeCity_Corridor2.s
index 699338f21..699338f21 100644
--- a/data/maps/scripts/EverGrandeCity_Corridor2.s
+++ b/data/scripts/maps/EverGrandeCity_Corridor2.s
diff --git a/data/maps/scripts/EverGrandeCity_Corridor3.s b/data/scripts/maps/EverGrandeCity_Corridor3.s
index d70b390a5..d70b390a5 100644
--- a/data/maps/scripts/EverGrandeCity_Corridor3.s
+++ b/data/scripts/maps/EverGrandeCity_Corridor3.s
diff --git a/data/maps/scripts/EverGrandeCity_Corridor4.s b/data/scripts/maps/EverGrandeCity_Corridor4.s
index 131f5d342..131f5d342 100644
--- a/data/maps/scripts/EverGrandeCity_Corridor4.s
+++ b/data/scripts/maps/EverGrandeCity_Corridor4.s
diff --git a/data/maps/scripts/EverGrandeCity_Corridor5.s b/data/scripts/maps/EverGrandeCity_Corridor5.s
index d27df4ec8..d27df4ec8 100644
--- a/data/maps/scripts/EverGrandeCity_Corridor5.s
+++ b/data/scripts/maps/EverGrandeCity_Corridor5.s
diff --git a/data/maps/scripts/EverGrandeCity_DrakesRoom.s b/data/scripts/maps/EverGrandeCity_DrakesRoom.s
index 035566c4e..035566c4e 100644
--- a/data/maps/scripts/EverGrandeCity_DrakesRoom.s
+++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.s
diff --git a/data/maps/scripts/EverGrandeCity_GlaciasRoom.s b/data/scripts/maps/EverGrandeCity_GlaciasRoom.s
index 830a810e6..830a810e6 100644
--- a/data/maps/scripts/EverGrandeCity_GlaciasRoom.s
+++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.s
diff --git a/data/maps/scripts/EverGrandeCity_HallOfFame.s b/data/scripts/maps/EverGrandeCity_HallOfFame.s
index e3d3b74e4..e3d3b74e4 100644
--- a/data/maps/scripts/EverGrandeCity_HallOfFame.s
+++ b/data/scripts/maps/EverGrandeCity_HallOfFame.s
diff --git a/data/maps/scripts/EverGrandeCity_PhoebesRoom.s b/data/scripts/maps/EverGrandeCity_PhoebesRoom.s
index f97a892ce..f97a892ce 100644
--- a/data/maps/scripts/EverGrandeCity_PhoebesRoom.s
+++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.s
diff --git a/data/maps/scripts/EverGrandeCity_PokemonCenter_1F.s b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.s
index 85d9e2241..85d9e2241 100644
--- a/data/maps/scripts/EverGrandeCity_PokemonCenter_1F.s
+++ b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.s
diff --git a/data/maps/scripts/EverGrandeCity_PokemonCenter_2F.s b/data/scripts/maps/EverGrandeCity_PokemonCenter_2F.s
index 27da0d547..27da0d547 100644
--- a/data/maps/scripts/EverGrandeCity_PokemonCenter_2F.s
+++ b/data/scripts/maps/EverGrandeCity_PokemonCenter_2F.s
diff --git a/data/maps/scripts/EverGrandeCity_PokemonLeague.s b/data/scripts/maps/EverGrandeCity_PokemonLeague.s
index e5179022f..e5179022f 100644
--- a/data/maps/scripts/EverGrandeCity_PokemonLeague.s
+++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.s
diff --git a/data/maps/scripts/EverGrandeCity_SidneysRoom.s b/data/scripts/maps/EverGrandeCity_SidneysRoom.s
index 02d8107d7..02d8107d7 100644
--- a/data/maps/scripts/EverGrandeCity_SidneysRoom.s
+++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.s
diff --git a/data/maps/scripts/FallarborTown.s b/data/scripts/maps/FallarborTown.s
index a2e3865c3..a2e3865c3 100644
--- a/data/maps/scripts/FallarborTown.s
+++ b/data/scripts/maps/FallarborTown.s
diff --git a/data/maps/scripts/FallarborTown_ContestHall.s b/data/scripts/maps/FallarborTown_ContestHall.s
index 74deba311..74deba311 100644
--- a/data/maps/scripts/FallarborTown_ContestHall.s
+++ b/data/scripts/maps/FallarborTown_ContestHall.s
diff --git a/data/maps/scripts/FallarborTown_ContestLobby.s b/data/scripts/maps/FallarborTown_ContestLobby.s
index bad7e79d2..bad7e79d2 100644
--- a/data/maps/scripts/FallarborTown_ContestLobby.s
+++ b/data/scripts/maps/FallarborTown_ContestLobby.s
diff --git a/data/maps/scripts/FallarborTown_House1.s b/data/scripts/maps/FallarborTown_House1.s
index 379c17ef9..379c17ef9 100644
--- a/data/maps/scripts/FallarborTown_House1.s
+++ b/data/scripts/maps/FallarborTown_House1.s
diff --git a/data/maps/scripts/FallarborTown_House2.s b/data/scripts/maps/FallarborTown_House2.s
index e63074905..e63074905 100644
--- a/data/maps/scripts/FallarborTown_House2.s
+++ b/data/scripts/maps/FallarborTown_House2.s
diff --git a/data/maps/scripts/FallarborTown_Mart.s b/data/scripts/maps/FallarborTown_Mart.s
index 123128d22..123128d22 100644
--- a/data/maps/scripts/FallarborTown_Mart.s
+++ b/data/scripts/maps/FallarborTown_Mart.s
diff --git a/data/maps/scripts/FallarborTown_PokemonCenter_1F.s b/data/scripts/maps/FallarborTown_PokemonCenter_1F.s
index 04a08eeb3..04a08eeb3 100644
--- a/data/maps/scripts/FallarborTown_PokemonCenter_1F.s
+++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.s
diff --git a/data/maps/scripts/FallarborTown_PokemonCenter_2F.s b/data/scripts/maps/FallarborTown_PokemonCenter_2F.s
index bc3fb9acb..bc3fb9acb 100644
--- a/data/maps/scripts/FallarborTown_PokemonCenter_2F.s
+++ b/data/scripts/maps/FallarborTown_PokemonCenter_2F.s
diff --git a/data/maps/scripts/FieryPath.s b/data/scripts/maps/FieryPath.s
index d89bd3476..d89bd3476 100644
--- a/data/maps/scripts/FieryPath.s
+++ b/data/scripts/maps/FieryPath.s
diff --git a/data/maps/scripts/FortreeCity.s b/data/scripts/maps/FortreeCity.s
index 96248b265..96248b265 100644
--- a/data/maps/scripts/FortreeCity.s
+++ b/data/scripts/maps/FortreeCity.s
diff --git a/data/maps/scripts/FortreeCity_DecorationShop.s b/data/scripts/maps/FortreeCity_DecorationShop.s
index f006755d4..f006755d4 100644
--- a/data/maps/scripts/FortreeCity_DecorationShop.s
+++ b/data/scripts/maps/FortreeCity_DecorationShop.s
diff --git a/data/maps/scripts/FortreeCity_Gym.s b/data/scripts/maps/FortreeCity_Gym.s
index a9d641f57..a9d641f57 100644
--- a/data/maps/scripts/FortreeCity_Gym.s
+++ b/data/scripts/maps/FortreeCity_Gym.s
diff --git a/data/maps/scripts/FortreeCity_House1.s b/data/scripts/maps/FortreeCity_House1.s
index 827e6cc34..827e6cc34 100644
--- a/data/maps/scripts/FortreeCity_House1.s
+++ b/data/scripts/maps/FortreeCity_House1.s
diff --git a/data/maps/scripts/FortreeCity_House2.s b/data/scripts/maps/FortreeCity_House2.s
index adf190f5c..adf190f5c 100644
--- a/data/maps/scripts/FortreeCity_House2.s
+++ b/data/scripts/maps/FortreeCity_House2.s
diff --git a/data/maps/scripts/FortreeCity_House3.s b/data/scripts/maps/FortreeCity_House3.s
index 99ff44637..99ff44637 100644
--- a/data/maps/scripts/FortreeCity_House3.s
+++ b/data/scripts/maps/FortreeCity_House3.s
diff --git a/data/maps/scripts/FortreeCity_House4.s b/data/scripts/maps/FortreeCity_House4.s
index f48ef1a6d..f48ef1a6d 100644
--- a/data/maps/scripts/FortreeCity_House4.s
+++ b/data/scripts/maps/FortreeCity_House4.s
diff --git a/data/maps/scripts/FortreeCity_House5.s b/data/scripts/maps/FortreeCity_House5.s
index 3c92a619c..3c92a619c 100644
--- a/data/maps/scripts/FortreeCity_House5.s
+++ b/data/scripts/maps/FortreeCity_House5.s
diff --git a/data/maps/scripts/FortreeCity_Mart.s b/data/scripts/maps/FortreeCity_Mart.s
index 6c9cf6298..6c9cf6298 100644
--- a/data/maps/scripts/FortreeCity_Mart.s
+++ b/data/scripts/maps/FortreeCity_Mart.s
diff --git a/data/maps/scripts/FortreeCity_PokemonCenter_1F.s b/data/scripts/maps/FortreeCity_PokemonCenter_1F.s
index d8a8945c9..d8a8945c9 100644
--- a/data/maps/scripts/FortreeCity_PokemonCenter_1F.s
+++ b/data/scripts/maps/FortreeCity_PokemonCenter_1F.s
diff --git a/data/maps/scripts/FortreeCity_PokemonCenter_2F.s b/data/scripts/maps/FortreeCity_PokemonCenter_2F.s
index 0b63f5670..0b63f5670 100644
--- a/data/maps/scripts/FortreeCity_PokemonCenter_2F.s
+++ b/data/scripts/maps/FortreeCity_PokemonCenter_2F.s
diff --git a/data/maps/scripts/GraniteCave_1F.s b/data/scripts/maps/GraniteCave_1F.s
index 5e05f8602..5e05f8602 100644
--- a/data/maps/scripts/GraniteCave_1F.s
+++ b/data/scripts/maps/GraniteCave_1F.s
diff --git a/data/maps/scripts/GraniteCave_B1F.s b/data/scripts/maps/GraniteCave_B1F.s
index 538c58118..538c58118 100644
--- a/data/maps/scripts/GraniteCave_B1F.s
+++ b/data/scripts/maps/GraniteCave_B1F.s
diff --git a/data/maps/scripts/GraniteCave_B2F.s b/data/scripts/maps/GraniteCave_B2F.s
index d28614032..d28614032 100644
--- a/data/maps/scripts/GraniteCave_B2F.s
+++ b/data/scripts/maps/GraniteCave_B2F.s
diff --git a/data/maps/scripts/GraniteCave_StevensRoom.s b/data/scripts/maps/GraniteCave_StevensRoom.s
index 55dccda5f..55dccda5f 100644
--- a/data/maps/scripts/GraniteCave_StevensRoom.s
+++ b/data/scripts/maps/GraniteCave_StevensRoom.s
diff --git a/data/maps/scripts/InsideOfTruck.s b/data/scripts/maps/InsideOfTruck.s
index e411adde2..e411adde2 100644
--- a/data/maps/scripts/InsideOfTruck.s
+++ b/data/scripts/maps/InsideOfTruck.s
diff --git a/data/maps/scripts/IslandCave.s b/data/scripts/maps/IslandCave.s
index 4cad35aab..4cad35aab 100644
--- a/data/maps/scripts/IslandCave.s
+++ b/data/scripts/maps/IslandCave.s
diff --git a/data/maps/scripts/JaggedPass.s b/data/scripts/maps/JaggedPass.s
index a4aa0964b..a4aa0964b 100644
--- a/data/maps/scripts/JaggedPass.s
+++ b/data/scripts/maps/JaggedPass.s
diff --git a/data/maps/scripts/LavaridgeTown.s b/data/scripts/maps/LavaridgeTown.s
index 0f668c584..0f668c584 100644
--- a/data/maps/scripts/LavaridgeTown.s
+++ b/data/scripts/maps/LavaridgeTown.s
diff --git a/data/maps/scripts/LavaridgeTown_Gym_1F.s b/data/scripts/maps/LavaridgeTown_Gym_1F.s
index a44b3cf16..a44b3cf16 100644
--- a/data/maps/scripts/LavaridgeTown_Gym_1F.s
+++ b/data/scripts/maps/LavaridgeTown_Gym_1F.s
diff --git a/data/maps/scripts/LavaridgeTown_Gym_B1F.s b/data/scripts/maps/LavaridgeTown_Gym_B1F.s
index 428c76c49..428c76c49 100644
--- a/data/maps/scripts/LavaridgeTown_Gym_B1F.s
+++ b/data/scripts/maps/LavaridgeTown_Gym_B1F.s
diff --git a/data/maps/scripts/LavaridgeTown_HerbShop.s b/data/scripts/maps/LavaridgeTown_HerbShop.s
index 96d95a75c..96d95a75c 100644
--- a/data/maps/scripts/LavaridgeTown_HerbShop.s
+++ b/data/scripts/maps/LavaridgeTown_HerbShop.s
diff --git a/data/maps/scripts/LavaridgeTown_House.s b/data/scripts/maps/LavaridgeTown_House.s
index 7d5e9bf8b..7d5e9bf8b 100644
--- a/data/maps/scripts/LavaridgeTown_House.s
+++ b/data/scripts/maps/LavaridgeTown_House.s
diff --git a/data/maps/scripts/LavaridgeTown_Mart.s b/data/scripts/maps/LavaridgeTown_Mart.s
index 13e119eeb..13e119eeb 100644
--- a/data/maps/scripts/LavaridgeTown_Mart.s
+++ b/data/scripts/maps/LavaridgeTown_Mart.s
diff --git a/data/maps/scripts/LavaridgeTown_PokemonCenter_1F.s b/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.s
index 8c17e6d4c..8c17e6d4c 100644
--- a/data/maps/scripts/LavaridgeTown_PokemonCenter_1F.s
+++ b/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.s
diff --git a/data/maps/scripts/LavaridgeTown_PokemonCenter_2F.s b/data/scripts/maps/LavaridgeTown_PokemonCenter_2F.s
index 9b7949ecc..9b7949ecc 100644
--- a/data/maps/scripts/LavaridgeTown_PokemonCenter_2F.s
+++ b/data/scripts/maps/LavaridgeTown_PokemonCenter_2F.s
diff --git a/data/maps/scripts/LilycoveCity.s b/data/scripts/maps/LilycoveCity.s
index 55e1f2a79..55e1f2a79 100644
--- a/data/maps/scripts/LilycoveCity.s
+++ b/data/scripts/maps/LilycoveCity.s
diff --git a/data/maps/scripts/LilycoveCity_ContestHall.s b/data/scripts/maps/LilycoveCity_ContestHall.s
index a06ccf14d..a06ccf14d 100644
--- a/data/maps/scripts/LilycoveCity_ContestHall.s
+++ b/data/scripts/maps/LilycoveCity_ContestHall.s
diff --git a/data/maps/scripts/LilycoveCity_ContestLobby.s b/data/scripts/maps/LilycoveCity_ContestLobby.s
index f1f1e7925..f1f1e7925 100644
--- a/data/maps/scripts/LilycoveCity_ContestLobby.s
+++ b/data/scripts/maps/LilycoveCity_ContestLobby.s
diff --git a/data/maps/scripts/LilycoveCity_CoveLilyMotel_1F.s b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.s
index 95047f532..95047f532 100644
--- a/data/maps/scripts/LilycoveCity_CoveLilyMotel_1F.s
+++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.s
diff --git a/data/maps/scripts/LilycoveCity_CoveLilyMotel_2F.s b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.s
index 5f9c6cd08..5f9c6cd08 100644
--- a/data/maps/scripts/LilycoveCity_CoveLilyMotel_2F.s
+++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.s
diff --git a/data/maps/scripts/LilycoveCity_DepartmentStoreElevator.s b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.s
index 1dfacdfbf..1dfacdfbf 100644
--- a/data/maps/scripts/LilycoveCity_DepartmentStoreElevator.s
+++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.s
diff --git a/data/maps/scripts/LilycoveCity_DepartmentStoreRooftop.s b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.s
index b98cc38b5..b98cc38b5 100644
--- a/data/maps/scripts/LilycoveCity_DepartmentStoreRooftop.s
+++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.s
diff --git a/data/maps/scripts/LilycoveCity_DepartmentStore_1F.s b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.s
index 8a84101aa..8a84101aa 100644
--- a/data/maps/scripts/LilycoveCity_DepartmentStore_1F.s
+++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.s
diff --git a/data/maps/scripts/LilycoveCity_DepartmentStore_2F.s b/data/scripts/maps/LilycoveCity_DepartmentStore_2F.s
index f331dc758..f331dc758 100644
--- a/data/maps/scripts/LilycoveCity_DepartmentStore_2F.s
+++ b/data/scripts/maps/LilycoveCity_DepartmentStore_2F.s
diff --git a/data/maps/scripts/LilycoveCity_DepartmentStore_3F.s b/data/scripts/maps/LilycoveCity_DepartmentStore_3F.s
index eddabf55f..eddabf55f 100644
--- a/data/maps/scripts/LilycoveCity_DepartmentStore_3F.s
+++ b/data/scripts/maps/LilycoveCity_DepartmentStore_3F.s
diff --git a/data/maps/scripts/LilycoveCity_DepartmentStore_4F.s b/data/scripts/maps/LilycoveCity_DepartmentStore_4F.s
index 7466deb99..7466deb99 100644
--- a/data/maps/scripts/LilycoveCity_DepartmentStore_4F.s
+++ b/data/scripts/maps/LilycoveCity_DepartmentStore_4F.s
diff --git a/data/maps/scripts/LilycoveCity_DepartmentStore_5F.s b/data/scripts/maps/LilycoveCity_DepartmentStore_5F.s
index bfe83d6ec..bfe83d6ec 100644
--- a/data/maps/scripts/LilycoveCity_DepartmentStore_5F.s
+++ b/data/scripts/maps/LilycoveCity_DepartmentStore_5F.s
diff --git a/data/maps/scripts/LilycoveCity_EmptyMap.s b/data/scripts/maps/LilycoveCity_EmptyMap.s
index 25ecb3866..25ecb3866 100644
--- a/data/maps/scripts/LilycoveCity_EmptyMap.s
+++ b/data/scripts/maps/LilycoveCity_EmptyMap.s
diff --git a/data/maps/scripts/LilycoveCity_Harbor.s b/data/scripts/maps/LilycoveCity_Harbor.s
index 6195332a1..6195332a1 100644
--- a/data/maps/scripts/LilycoveCity_Harbor.s
+++ b/data/scripts/maps/LilycoveCity_Harbor.s
diff --git a/data/maps/scripts/LilycoveCity_House1.s b/data/scripts/maps/LilycoveCity_House1.s
index 28a4532b1..28a4532b1 100644
--- a/data/maps/scripts/LilycoveCity_House1.s
+++ b/data/scripts/maps/LilycoveCity_House1.s
diff --git a/data/maps/scripts/LilycoveCity_House2.s b/data/scripts/maps/LilycoveCity_House2.s
index c1fe01b46..c1fe01b46 100644
--- a/data/maps/scripts/LilycoveCity_House2.s
+++ b/data/scripts/maps/LilycoveCity_House2.s
diff --git a/data/maps/scripts/LilycoveCity_House3.s b/data/scripts/maps/LilycoveCity_House3.s
index 5c4eaac9d..5c4eaac9d 100644
--- a/data/maps/scripts/LilycoveCity_House3.s
+++ b/data/scripts/maps/LilycoveCity_House3.s
diff --git a/data/maps/scripts/LilycoveCity_House4.s b/data/scripts/maps/LilycoveCity_House4.s
index 98d8ca9a4..98d8ca9a4 100644
--- a/data/maps/scripts/LilycoveCity_House4.s
+++ b/data/scripts/maps/LilycoveCity_House4.s
diff --git a/data/maps/scripts/LilycoveCity_LilycoveMuseum_1F.s b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.s
index 9975419d0..9975419d0 100644
--- a/data/maps/scripts/LilycoveCity_LilycoveMuseum_1F.s
+++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.s
diff --git a/data/maps/scripts/LilycoveCity_LilycoveMuseum_2F.s b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.s
index 44015d256..44015d256 100644
--- a/data/maps/scripts/LilycoveCity_LilycoveMuseum_2F.s
+++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.s
diff --git a/data/maps/scripts/LilycoveCity_MoveDeletersHouse.s b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.s
index cd6f648a4..cd6f648a4 100644
--- a/data/maps/scripts/LilycoveCity_MoveDeletersHouse.s
+++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.s
diff --git a/data/maps/scripts/LilycoveCity_PokemonCenter_1F.s b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.s
index d34bd0b84..d34bd0b84 100644
--- a/data/maps/scripts/LilycoveCity_PokemonCenter_1F.s
+++ b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.s
diff --git a/data/maps/scripts/LilycoveCity_PokemonCenter_2F.s b/data/scripts/maps/LilycoveCity_PokemonCenter_2F.s
index ee60cf2ca..ee60cf2ca 100644
--- a/data/maps/scripts/LilycoveCity_PokemonCenter_2F.s
+++ b/data/scripts/maps/LilycoveCity_PokemonCenter_2F.s
diff --git a/data/maps/scripts/LilycoveCity_PokemonTrainerFanClub.s b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.s
index c76acaff4..c76acaff4 100644
--- a/data/maps/scripts/LilycoveCity_PokemonTrainerFanClub.s
+++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.s
diff --git a/data/maps/scripts/LilycoveCity_UnusedMart.s b/data/scripts/maps/LilycoveCity_UnusedMart.s
index edfd32b4a..edfd32b4a 100644
--- a/data/maps/scripts/LilycoveCity_UnusedMart.s
+++ b/data/scripts/maps/LilycoveCity_UnusedMart.s
diff --git a/data/maps/scripts/LinkContestRoom1.s b/data/scripts/maps/LinkContestRoom1.s
index 2709f558c..2709f558c 100644
--- a/data/maps/scripts/LinkContestRoom1.s
+++ b/data/scripts/maps/LinkContestRoom1.s
diff --git a/data/maps/scripts/LinkContestRoom2.s b/data/scripts/maps/LinkContestRoom2.s
index f61e3fae6..f61e3fae6 100644
--- a/data/maps/scripts/LinkContestRoom2.s
+++ b/data/scripts/maps/LinkContestRoom2.s
diff --git a/data/maps/scripts/LinkContestRoom3.s b/data/scripts/maps/LinkContestRoom3.s
index 5a34f848a..5a34f848a 100644
--- a/data/maps/scripts/LinkContestRoom3.s
+++ b/data/scripts/maps/LinkContestRoom3.s
diff --git a/data/maps/scripts/LinkContestRoom4.s b/data/scripts/maps/LinkContestRoom4.s
index bf6539bdd..bf6539bdd 100644
--- a/data/maps/scripts/LinkContestRoom4.s
+++ b/data/scripts/maps/LinkContestRoom4.s
diff --git a/data/maps/scripts/LinkContestRoom5.s b/data/scripts/maps/LinkContestRoom5.s
index d3cd5d64b..d3cd5d64b 100644
--- a/data/maps/scripts/LinkContestRoom5.s
+++ b/data/scripts/maps/LinkContestRoom5.s
diff --git a/data/maps/scripts/LinkContestRoom6.s b/data/scripts/maps/LinkContestRoom6.s
index 26296ece6..26296ece6 100644
--- a/data/maps/scripts/LinkContestRoom6.s
+++ b/data/scripts/maps/LinkContestRoom6.s
diff --git a/data/maps/scripts/LittlerootTown.s b/data/scripts/maps/LittlerootTown.s
index 600218ebf..600218ebf 100644
--- a/data/maps/scripts/LittlerootTown.s
+++ b/data/scripts/maps/LittlerootTown.s
diff --git a/data/maps/scripts/LittlerootTown_BrendansHouse_1F.s b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.s
index 78a10f6e6..78a10f6e6 100644
--- a/data/maps/scripts/LittlerootTown_BrendansHouse_1F.s
+++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.s
diff --git a/data/maps/scripts/LittlerootTown_BrendansHouse_2F.s b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.s
index e22ae74ca..e22ae74ca 100644
--- a/data/maps/scripts/LittlerootTown_BrendansHouse_2F.s
+++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.s
diff --git a/data/maps/scripts/LittlerootTown_MaysHouse_1F.s b/data/scripts/maps/LittlerootTown_MaysHouse_1F.s
index baf6df5af..baf6df5af 100644
--- a/data/maps/scripts/LittlerootTown_MaysHouse_1F.s
+++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.s
diff --git a/data/maps/scripts/LittlerootTown_MaysHouse_2F.s b/data/scripts/maps/LittlerootTown_MaysHouse_2F.s
index 34a7752fa..34a7752fa 100644
--- a/data/maps/scripts/LittlerootTown_MaysHouse_2F.s
+++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.s
diff --git a/data/maps/scripts/LittlerootTown_ProfessorBirchsLab.s b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.s
index 81bb270fc..81bb270fc 100644
--- a/data/maps/scripts/LittlerootTown_ProfessorBirchsLab.s
+++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.s
diff --git a/data/maps/scripts/MagmaHideout_1F.s b/data/scripts/maps/MagmaHideout_1F.s
index c58248c10..c58248c10 100644
--- a/data/maps/scripts/MagmaHideout_1F.s
+++ b/data/scripts/maps/MagmaHideout_1F.s
diff --git a/data/maps/scripts/MagmaHideout_B1F.s b/data/scripts/maps/MagmaHideout_B1F.s
index ca2d6f773..ca2d6f773 100644
--- a/data/maps/scripts/MagmaHideout_B1F.s
+++ b/data/scripts/maps/MagmaHideout_B1F.s
diff --git a/data/maps/scripts/MagmaHideout_B2F.s b/data/scripts/maps/MagmaHideout_B2F.s
index 09b6659c3..09b6659c3 100644
--- a/data/maps/scripts/MagmaHideout_B2F.s
+++ b/data/scripts/maps/MagmaHideout_B2F.s
diff --git a/data/maps/scripts/MauvilleCity.s b/data/scripts/maps/MauvilleCity.s
index 229b6143c..229b6143c 100644
--- a/data/maps/scripts/MauvilleCity.s
+++ b/data/scripts/maps/MauvilleCity.s
diff --git a/data/maps/scripts/MauvilleCity_BikeShop.s b/data/scripts/maps/MauvilleCity_BikeShop.s
index 9d9293365..9d9293365 100644
--- a/data/maps/scripts/MauvilleCity_BikeShop.s
+++ b/data/scripts/maps/MauvilleCity_BikeShop.s
diff --git a/data/maps/scripts/MauvilleCity_GameCorner.s b/data/scripts/maps/MauvilleCity_GameCorner.s
index a77e099c5..a77e099c5 100644
--- a/data/maps/scripts/MauvilleCity_GameCorner.s
+++ b/data/scripts/maps/MauvilleCity_GameCorner.s
diff --git a/data/maps/scripts/MauvilleCity_Gym.s b/data/scripts/maps/MauvilleCity_Gym.s
index bbae24bf3..bbae24bf3 100644
--- a/data/maps/scripts/MauvilleCity_Gym.s
+++ b/data/scripts/maps/MauvilleCity_Gym.s
diff --git a/data/maps/scripts/MauvilleCity_House1.s b/data/scripts/maps/MauvilleCity_House1.s
index e1ae389bb..e1ae389bb 100644
--- a/data/maps/scripts/MauvilleCity_House1.s
+++ b/data/scripts/maps/MauvilleCity_House1.s
diff --git a/data/maps/scripts/MauvilleCity_House2.s b/data/scripts/maps/MauvilleCity_House2.s
index 65e7c0e3e..65e7c0e3e 100644
--- a/data/maps/scripts/MauvilleCity_House2.s
+++ b/data/scripts/maps/MauvilleCity_House2.s
diff --git a/data/maps/scripts/MauvilleCity_Mart.s b/data/scripts/maps/MauvilleCity_Mart.s
index 312b64226..312b64226 100644
--- a/data/maps/scripts/MauvilleCity_Mart.s
+++ b/data/scripts/maps/MauvilleCity_Mart.s
diff --git a/data/maps/scripts/MauvilleCity_PokemonCenter_1F.s b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.s
index 6a1582145..6a1582145 100644
--- a/data/maps/scripts/MauvilleCity_PokemonCenter_1F.s
+++ b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.s
diff --git a/data/maps/scripts/MauvilleCity_PokemonCenter_2F.s b/data/scripts/maps/MauvilleCity_PokemonCenter_2F.s
index e888ecc6e..e888ecc6e 100644
--- a/data/maps/scripts/MauvilleCity_PokemonCenter_2F.s
+++ b/data/scripts/maps/MauvilleCity_PokemonCenter_2F.s
diff --git a/data/maps/scripts/MeteorFalls_1F_1R.s b/data/scripts/maps/MeteorFalls_1F_1R.s
index 7574a9b4b..7574a9b4b 100644
--- a/data/maps/scripts/MeteorFalls_1F_1R.s
+++ b/data/scripts/maps/MeteorFalls_1F_1R.s
diff --git a/data/maps/scripts/MeteorFalls_1F_2R.s b/data/scripts/maps/MeteorFalls_1F_2R.s
index ffd6f619c..ffd6f619c 100644
--- a/data/maps/scripts/MeteorFalls_1F_2R.s
+++ b/data/scripts/maps/MeteorFalls_1F_2R.s
diff --git a/data/maps/scripts/MeteorFalls_B1F_1R.s b/data/scripts/maps/MeteorFalls_B1F_1R.s
index 024cf305e..024cf305e 100644
--- a/data/maps/scripts/MeteorFalls_B1F_1R.s
+++ b/data/scripts/maps/MeteorFalls_B1F_1R.s
diff --git a/data/maps/scripts/MeteorFalls_B1F_2R.s b/data/scripts/maps/MeteorFalls_B1F_2R.s
index 1f1f6ee99..1f1f6ee99 100644
--- a/data/maps/scripts/MeteorFalls_B1F_2R.s
+++ b/data/scripts/maps/MeteorFalls_B1F_2R.s
diff --git a/data/maps/scripts/MossdeepCity.s b/data/scripts/maps/MossdeepCity.s
index 70adb2f9d..70adb2f9d 100644
--- a/data/maps/scripts/MossdeepCity.s
+++ b/data/scripts/maps/MossdeepCity.s
diff --git a/data/maps/scripts/MossdeepCity_GameCorner_1F.s b/data/scripts/maps/MossdeepCity_GameCorner_1F.s
index 573e69d8e..573e69d8e 100644
--- a/data/maps/scripts/MossdeepCity_GameCorner_1F.s
+++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.s
diff --git a/data/maps/scripts/MossdeepCity_GameCorner_B1F.s b/data/scripts/maps/MossdeepCity_GameCorner_B1F.s
index 3fa9fe707..3fa9fe707 100644
--- a/data/maps/scripts/MossdeepCity_GameCorner_B1F.s
+++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.s
diff --git a/data/maps/scripts/MossdeepCity_Gym.s b/data/scripts/maps/MossdeepCity_Gym.s
index a28f6043a..a28f6043a 100644
--- a/data/maps/scripts/MossdeepCity_Gym.s
+++ b/data/scripts/maps/MossdeepCity_Gym.s
diff --git a/data/maps/scripts/MossdeepCity_House1.s b/data/scripts/maps/MossdeepCity_House1.s
index 607ca1baa..607ca1baa 100644
--- a/data/maps/scripts/MossdeepCity_House1.s
+++ b/data/scripts/maps/MossdeepCity_House1.s
diff --git a/data/maps/scripts/MossdeepCity_House2.s b/data/scripts/maps/MossdeepCity_House2.s
index 99aa63f91..99aa63f91 100644
--- a/data/maps/scripts/MossdeepCity_House2.s
+++ b/data/scripts/maps/MossdeepCity_House2.s
diff --git a/data/maps/scripts/MossdeepCity_House3.s b/data/scripts/maps/MossdeepCity_House3.s
index 9401bf58e..9401bf58e 100644
--- a/data/maps/scripts/MossdeepCity_House3.s
+++ b/data/scripts/maps/MossdeepCity_House3.s
diff --git a/data/maps/scripts/MossdeepCity_House4.s b/data/scripts/maps/MossdeepCity_House4.s
index 3fde63469..3fde63469 100644
--- a/data/maps/scripts/MossdeepCity_House4.s
+++ b/data/scripts/maps/MossdeepCity_House4.s
diff --git a/data/maps/scripts/MossdeepCity_Mart.s b/data/scripts/maps/MossdeepCity_Mart.s
index ef20523a8..ef20523a8 100644
--- a/data/maps/scripts/MossdeepCity_Mart.s
+++ b/data/scripts/maps/MossdeepCity_Mart.s
diff --git a/data/maps/scripts/MossdeepCity_PokemonCenter_1F.s b/data/scripts/maps/MossdeepCity_PokemonCenter_1F.s
index 4ac89863a..4ac89863a 100644
--- a/data/maps/scripts/MossdeepCity_PokemonCenter_1F.s
+++ b/data/scripts/maps/MossdeepCity_PokemonCenter_1F.s
diff --git a/data/maps/scripts/MossdeepCity_PokemonCenter_2F.s b/data/scripts/maps/MossdeepCity_PokemonCenter_2F.s
index 09aca3dae..09aca3dae 100644
--- a/data/maps/scripts/MossdeepCity_PokemonCenter_2F.s
+++ b/data/scripts/maps/MossdeepCity_PokemonCenter_2F.s
diff --git a/data/maps/scripts/MossdeepCity_SpaceCenter_1F.s b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.s
index 460281ebb..460281ebb 100644
--- a/data/maps/scripts/MossdeepCity_SpaceCenter_1F.s
+++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.s
diff --git a/data/maps/scripts/MossdeepCity_SpaceCenter_2F.s b/data/scripts/maps/MossdeepCity_SpaceCenter_2F.s
index 145cae073..145cae073 100644
--- a/data/maps/scripts/MossdeepCity_SpaceCenter_2F.s
+++ b/data/scripts/maps/MossdeepCity_SpaceCenter_2F.s
diff --git a/data/maps/scripts/MossdeepCity_StevensHouse.s b/data/scripts/maps/MossdeepCity_StevensHouse.s
index 69e0fbffd..69e0fbffd 100644
--- a/data/maps/scripts/MossdeepCity_StevensHouse.s
+++ b/data/scripts/maps/MossdeepCity_StevensHouse.s
diff --git a/data/maps/scripts/MtChimney.s b/data/scripts/maps/MtChimney.s
index 8c7db64be..8c7db64be 100644
--- a/data/maps/scripts/MtChimney.s
+++ b/data/scripts/maps/MtChimney.s
diff --git a/data/maps/scripts/MtChimney_CableCarStation.s b/data/scripts/maps/MtChimney_CableCarStation.s
index 2f916a554..2f916a554 100644
--- a/data/maps/scripts/MtChimney_CableCarStation.s
+++ b/data/scripts/maps/MtChimney_CableCarStation.s
diff --git a/data/maps/scripts/MtPyre_1F.s b/data/scripts/maps/MtPyre_1F.s
index cc9ff3cba..cc9ff3cba 100644
--- a/data/maps/scripts/MtPyre_1F.s
+++ b/data/scripts/maps/MtPyre_1F.s
diff --git a/data/maps/scripts/MtPyre_2F.s b/data/scripts/maps/MtPyre_2F.s
index f01d63528..f01d63528 100644
--- a/data/maps/scripts/MtPyre_2F.s
+++ b/data/scripts/maps/MtPyre_2F.s
diff --git a/data/maps/scripts/MtPyre_3F.s b/data/scripts/maps/MtPyre_3F.s
index 2d571a99a..2d571a99a 100644
--- a/data/maps/scripts/MtPyre_3F.s
+++ b/data/scripts/maps/MtPyre_3F.s
diff --git a/data/maps/scripts/MtPyre_4F.s b/data/scripts/maps/MtPyre_4F.s
index 34fd8db92..34fd8db92 100644
--- a/data/maps/scripts/MtPyre_4F.s
+++ b/data/scripts/maps/MtPyre_4F.s
diff --git a/data/maps/scripts/MtPyre_5F.s b/data/scripts/maps/MtPyre_5F.s
index 2495a4c9a..2495a4c9a 100644
--- a/data/maps/scripts/MtPyre_5F.s
+++ b/data/scripts/maps/MtPyre_5F.s
diff --git a/data/maps/scripts/MtPyre_6F.s b/data/scripts/maps/MtPyre_6F.s
index 90b9ac2be..90b9ac2be 100644
--- a/data/maps/scripts/MtPyre_6F.s
+++ b/data/scripts/maps/MtPyre_6F.s
diff --git a/data/maps/scripts/MtPyre_Exterior.s b/data/scripts/maps/MtPyre_Exterior.s
index 0cd44ed2b..0cd44ed2b 100644
--- a/data/maps/scripts/MtPyre_Exterior.s
+++ b/data/scripts/maps/MtPyre_Exterior.s
diff --git a/data/maps/scripts/MtPyre_Summit.s b/data/scripts/maps/MtPyre_Summit.s
index 41ffa235a..41ffa235a 100644
--- a/data/maps/scripts/MtPyre_Summit.s
+++ b/data/scripts/maps/MtPyre_Summit.s
diff --git a/data/maps/scripts/NewMauville_Entrance.s b/data/scripts/maps/NewMauville_Entrance.s
index 3683aea5b..3683aea5b 100644
--- a/data/maps/scripts/NewMauville_Entrance.s
+++ b/data/scripts/maps/NewMauville_Entrance.s
diff --git a/data/maps/scripts/NewMauville_Inside.s b/data/scripts/maps/NewMauville_Inside.s
index 7111ab770..7111ab770 100644
--- a/data/maps/scripts/NewMauville_Inside.s
+++ b/data/scripts/maps/NewMauville_Inside.s
diff --git a/data/maps/scripts/OldaleTown.s b/data/scripts/maps/OldaleTown.s
index 4595cd5c0..4595cd5c0 100644
--- a/data/maps/scripts/OldaleTown.s
+++ b/data/scripts/maps/OldaleTown.s
diff --git a/data/maps/scripts/OldaleTown_House1.s b/data/scripts/maps/OldaleTown_House1.s
index 033980c01..033980c01 100644
--- a/data/maps/scripts/OldaleTown_House1.s
+++ b/data/scripts/maps/OldaleTown_House1.s
diff --git a/data/maps/scripts/OldaleTown_House2.s b/data/scripts/maps/OldaleTown_House2.s
index 3cdcc49db..3cdcc49db 100644
--- a/data/maps/scripts/OldaleTown_House2.s
+++ b/data/scripts/maps/OldaleTown_House2.s
diff --git a/data/maps/scripts/OldaleTown_Mart.s b/data/scripts/maps/OldaleTown_Mart.s
index d4c76f516..d4c76f516 100644
--- a/data/maps/scripts/OldaleTown_Mart.s
+++ b/data/scripts/maps/OldaleTown_Mart.s
diff --git a/data/maps/scripts/OldaleTown_PokemonCenter_1F.s b/data/scripts/maps/OldaleTown_PokemonCenter_1F.s
index c9abc12a7..c9abc12a7 100644
--- a/data/maps/scripts/OldaleTown_PokemonCenter_1F.s
+++ b/data/scripts/maps/OldaleTown_PokemonCenter_1F.s
diff --git a/data/maps/scripts/OldaleTown_PokemonCenter_2F.s b/data/scripts/maps/OldaleTown_PokemonCenter_2F.s
index bab0f21af..bab0f21af 100644
--- a/data/maps/scripts/OldaleTown_PokemonCenter_2F.s
+++ b/data/scripts/maps/OldaleTown_PokemonCenter_2F.s
diff --git a/data/maps/scripts/PacifidlogTown.s b/data/scripts/maps/PacifidlogTown.s
index f1c6ed462..f1c6ed462 100644
--- a/data/maps/scripts/PacifidlogTown.s
+++ b/data/scripts/maps/PacifidlogTown.s
diff --git a/data/maps/scripts/PacifidlogTown_House1.s b/data/scripts/maps/PacifidlogTown_House1.s
index e7ad13f31..e7ad13f31 100644
--- a/data/maps/scripts/PacifidlogTown_House1.s
+++ b/data/scripts/maps/PacifidlogTown_House1.s
diff --git a/data/maps/scripts/PacifidlogTown_House2.s b/data/scripts/maps/PacifidlogTown_House2.s
index 5348a273d..5348a273d 100644
--- a/data/maps/scripts/PacifidlogTown_House2.s
+++ b/data/scripts/maps/PacifidlogTown_House2.s
diff --git a/data/maps/scripts/PacifidlogTown_House3.s b/data/scripts/maps/PacifidlogTown_House3.s
index 4dfc1fa92..4dfc1fa92 100644
--- a/data/maps/scripts/PacifidlogTown_House3.s
+++ b/data/scripts/maps/PacifidlogTown_House3.s
diff --git a/data/maps/scripts/PacifidlogTown_House4.s b/data/scripts/maps/PacifidlogTown_House4.s
index 1df583033..1df583033 100644
--- a/data/maps/scripts/PacifidlogTown_House4.s
+++ b/data/scripts/maps/PacifidlogTown_House4.s
diff --git a/data/maps/scripts/PacifidlogTown_House5.s b/data/scripts/maps/PacifidlogTown_House5.s
index 0aace4265..0aace4265 100644
--- a/data/maps/scripts/PacifidlogTown_House5.s
+++ b/data/scripts/maps/PacifidlogTown_House5.s
diff --git a/data/maps/scripts/PacifidlogTown_PokemonCenter_1F.s b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.s
index 6fa955c34..6fa955c34 100644
--- a/data/maps/scripts/PacifidlogTown_PokemonCenter_1F.s
+++ b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.s
diff --git a/data/maps/scripts/PacifidlogTown_PokemonCenter_2F.s b/data/scripts/maps/PacifidlogTown_PokemonCenter_2F.s
index 026119917..026119917 100644
--- a/data/maps/scripts/PacifidlogTown_PokemonCenter_2F.s
+++ b/data/scripts/maps/PacifidlogTown_PokemonCenter_2F.s
diff --git a/data/maps/scripts/PetalburgCity.s b/data/scripts/maps/PetalburgCity.s
index d82359af1..d82359af1 100644
--- a/data/maps/scripts/PetalburgCity.s
+++ b/data/scripts/maps/PetalburgCity.s
diff --git a/data/maps/scripts/PetalburgCity_Gym.s b/data/scripts/maps/PetalburgCity_Gym.s
index c9e54f6cf..c9e54f6cf 100644
--- a/data/maps/scripts/PetalburgCity_Gym.s
+++ b/data/scripts/maps/PetalburgCity_Gym.s
diff --git a/data/maps/scripts/PetalburgCity_House1.s b/data/scripts/maps/PetalburgCity_House1.s
index 3950e1259..3950e1259 100644
--- a/data/maps/scripts/PetalburgCity_House1.s
+++ b/data/scripts/maps/PetalburgCity_House1.s
diff --git a/data/maps/scripts/PetalburgCity_House2.s b/data/scripts/maps/PetalburgCity_House2.s
index fbd3f9b0d..fbd3f9b0d 100644
--- a/data/maps/scripts/PetalburgCity_House2.s
+++ b/data/scripts/maps/PetalburgCity_House2.s
diff --git a/data/maps/scripts/PetalburgCity_Mart.s b/data/scripts/maps/PetalburgCity_Mart.s
index 85fc92110..85fc92110 100644
--- a/data/maps/scripts/PetalburgCity_Mart.s
+++ b/data/scripts/maps/PetalburgCity_Mart.s
diff --git a/data/maps/scripts/PetalburgCity_PokemonCenter_1F.s b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.s
index faf7b8792..faf7b8792 100644
--- a/data/maps/scripts/PetalburgCity_PokemonCenter_1F.s
+++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.s
diff --git a/data/maps/scripts/PetalburgCity_PokemonCenter_2F.s b/data/scripts/maps/PetalburgCity_PokemonCenter_2F.s
index e26624dd6..e26624dd6 100644
--- a/data/maps/scripts/PetalburgCity_PokemonCenter_2F.s
+++ b/data/scripts/maps/PetalburgCity_PokemonCenter_2F.s
diff --git a/data/maps/scripts/PetalburgCity_WallysHouse.s b/data/scripts/maps/PetalburgCity_WallysHouse.s
index 724e0da6f..724e0da6f 100644
--- a/data/maps/scripts/PetalburgCity_WallysHouse.s
+++ b/data/scripts/maps/PetalburgCity_WallysHouse.s
diff --git a/data/maps/scripts/PetalburgWoods.s b/data/scripts/maps/PetalburgWoods.s
index 4642642a4..4642642a4 100644
--- a/data/maps/scripts/PetalburgWoods.s
+++ b/data/scripts/maps/PetalburgWoods.s
diff --git a/data/maps/scripts/RecordCorner.s b/data/scripts/maps/RecordCorner.s
index 60ea39284..60ea39284 100644
--- a/data/maps/scripts/RecordCorner.s
+++ b/data/scripts/maps/RecordCorner.s
diff --git a/data/maps/scripts/Route101.s b/data/scripts/maps/Route101.s
index a44d0ffd3..a44d0ffd3 100644
--- a/data/maps/scripts/Route101.s
+++ b/data/scripts/maps/Route101.s
diff --git a/data/maps/scripts/Route102.s b/data/scripts/maps/Route102.s
index 09ce6f806..09ce6f806 100644
--- a/data/maps/scripts/Route102.s
+++ b/data/scripts/maps/Route102.s
diff --git a/data/maps/scripts/Route103.s b/data/scripts/maps/Route103.s
index ad745ea37..ad745ea37 100644
--- a/data/maps/scripts/Route103.s
+++ b/data/scripts/maps/Route103.s
diff --git a/data/maps/scripts/Route104.s b/data/scripts/maps/Route104.s
index 624646d34..624646d34 100644
--- a/data/maps/scripts/Route104.s
+++ b/data/scripts/maps/Route104.s
diff --git a/data/maps/scripts/Route104_MrBrineysHouse.s b/data/scripts/maps/Route104_MrBrineysHouse.s
index 592e58ce8..592e58ce8 100644
--- a/data/maps/scripts/Route104_MrBrineysHouse.s
+++ b/data/scripts/maps/Route104_MrBrineysHouse.s
diff --git a/data/maps/scripts/Route104_PrettyPetalFlowerShop.s b/data/scripts/maps/Route104_PrettyPetalFlowerShop.s
index 18c4f85b7..18c4f85b7 100644
--- a/data/maps/scripts/Route104_PrettyPetalFlowerShop.s
+++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.s
diff --git a/data/maps/scripts/Route104_Prototype.s b/data/scripts/maps/Route104_Prototype.s
index 71022f23f..71022f23f 100644
--- a/data/maps/scripts/Route104_Prototype.s
+++ b/data/scripts/maps/Route104_Prototype.s
diff --git a/data/maps/scripts/Route104_PrototypePrettyPetalFlowerShop.s b/data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.s
index ce5355d8a..ce5355d8a 100644
--- a/data/maps/scripts/Route104_PrototypePrettyPetalFlowerShop.s
+++ b/data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.s
diff --git a/data/maps/scripts/Route105.s b/data/scripts/maps/Route105.s
index 391b31e34..391b31e34 100644
--- a/data/maps/scripts/Route105.s
+++ b/data/scripts/maps/Route105.s
diff --git a/data/maps/scripts/Route106.s b/data/scripts/maps/Route106.s
index c7c9820cd..c7c9820cd 100644
--- a/data/maps/scripts/Route106.s
+++ b/data/scripts/maps/Route106.s
diff --git a/data/maps/scripts/Route107.s b/data/scripts/maps/Route107.s
index c50eec6a1..c50eec6a1 100644
--- a/data/maps/scripts/Route107.s
+++ b/data/scripts/maps/Route107.s
diff --git a/data/maps/scripts/Route108.s b/data/scripts/maps/Route108.s
index 70a852195..70a852195 100644
--- a/data/maps/scripts/Route108.s
+++ b/data/scripts/maps/Route108.s
diff --git a/data/maps/scripts/Route109.s b/data/scripts/maps/Route109.s
index 39def243c..39def243c 100644
--- a/data/maps/scripts/Route109.s
+++ b/data/scripts/maps/Route109.s
diff --git a/data/maps/scripts/Route109_SeashoreHouse.s b/data/scripts/maps/Route109_SeashoreHouse.s
index aa9d55919..aa9d55919 100644
--- a/data/maps/scripts/Route109_SeashoreHouse.s
+++ b/data/scripts/maps/Route109_SeashoreHouse.s
diff --git a/data/maps/scripts/Route110.s b/data/scripts/maps/Route110.s
index 53b2c8172..53b2c8172 100644
--- a/data/maps/scripts/Route110.s
+++ b/data/scripts/maps/Route110.s
diff --git a/data/maps/scripts/Route110_SeasideCyclingRoadNorthEntrance.s b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.s
index ed5dd3cda..ed5dd3cda 100644
--- a/data/maps/scripts/Route110_SeasideCyclingRoadNorthEntrance.s
+++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.s
diff --git a/data/maps/scripts/Route110_SeasideCyclingRoadSouthEntrance.s b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.s
index d25463993..d25463993 100644
--- a/data/maps/scripts/Route110_SeasideCyclingRoadSouthEntrance.s
+++ b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.s
diff --git a/data/maps/scripts/Route110_TrickHouseCorridor.s b/data/scripts/maps/Route110_TrickHouseCorridor.s
index 06da2482d..06da2482d 100644
--- a/data/maps/scripts/Route110_TrickHouseCorridor.s
+++ b/data/scripts/maps/Route110_TrickHouseCorridor.s
diff --git a/data/maps/scripts/Route110_TrickHouseEnd.s b/data/scripts/maps/Route110_TrickHouseEnd.s
index 4b335af91..4b335af91 100644
--- a/data/maps/scripts/Route110_TrickHouseEnd.s
+++ b/data/scripts/maps/Route110_TrickHouseEnd.s
diff --git a/data/maps/scripts/Route110_TrickHouseEntrance.s b/data/scripts/maps/Route110_TrickHouseEntrance.s
index 08d78bfa1..08d78bfa1 100644
--- a/data/maps/scripts/Route110_TrickHouseEntrance.s
+++ b/data/scripts/maps/Route110_TrickHouseEntrance.s
diff --git a/data/maps/scripts/Route110_TrickHousePuzzle1.s b/data/scripts/maps/Route110_TrickHousePuzzle1.s
index 074273652..074273652 100644
--- a/data/maps/scripts/Route110_TrickHousePuzzle1.s
+++ b/data/scripts/maps/Route110_TrickHousePuzzle1.s
diff --git a/data/maps/scripts/Route110_TrickHousePuzzle2.s b/data/scripts/maps/Route110_TrickHousePuzzle2.s
index 0984690a1..0984690a1 100644
--- a/data/maps/scripts/Route110_TrickHousePuzzle2.s
+++ b/data/scripts/maps/Route110_TrickHousePuzzle2.s
diff --git a/data/maps/scripts/Route110_TrickHousePuzzle3.s b/data/scripts/maps/Route110_TrickHousePuzzle3.s
index 309728db7..309728db7 100644
--- a/data/maps/scripts/Route110_TrickHousePuzzle3.s
+++ b/data/scripts/maps/Route110_TrickHousePuzzle3.s
diff --git a/data/maps/scripts/Route110_TrickHousePuzzle4.s b/data/scripts/maps/Route110_TrickHousePuzzle4.s
index f8760aba7..f8760aba7 100644
--- a/data/maps/scripts/Route110_TrickHousePuzzle4.s
+++ b/data/scripts/maps/Route110_TrickHousePuzzle4.s
diff --git a/data/maps/scripts/Route110_TrickHousePuzzle5.s b/data/scripts/maps/Route110_TrickHousePuzzle5.s
index cd5d2fbb9..cd5d2fbb9 100644
--- a/data/maps/scripts/Route110_TrickHousePuzzle5.s
+++ b/data/scripts/maps/Route110_TrickHousePuzzle5.s
diff --git a/data/maps/scripts/Route110_TrickHousePuzzle6.s b/data/scripts/maps/Route110_TrickHousePuzzle6.s
index b921842d7..b921842d7 100644
--- a/data/maps/scripts/Route110_TrickHousePuzzle6.s
+++ b/data/scripts/maps/Route110_TrickHousePuzzle6.s
diff --git a/data/maps/scripts/Route110_TrickHousePuzzle7.s b/data/scripts/maps/Route110_TrickHousePuzzle7.s
index a50af06c4..a50af06c4 100644
--- a/data/maps/scripts/Route110_TrickHousePuzzle7.s
+++ b/data/scripts/maps/Route110_TrickHousePuzzle7.s
diff --git a/data/maps/scripts/Route110_TrickHousePuzzle8.s b/data/scripts/maps/Route110_TrickHousePuzzle8.s
index 99100e4f6..99100e4f6 100644
--- a/data/maps/scripts/Route110_TrickHousePuzzle8.s
+++ b/data/scripts/maps/Route110_TrickHousePuzzle8.s
diff --git a/data/maps/scripts/Route111.s b/data/scripts/maps/Route111.s
index 4a977f132..4a977f132 100644
--- a/data/maps/scripts/Route111.s
+++ b/data/scripts/maps/Route111.s
diff --git a/data/maps/scripts/Route111_OldLadysRestStop.s b/data/scripts/maps/Route111_OldLadysRestStop.s
index 81f66b738..81f66b738 100644
--- a/data/maps/scripts/Route111_OldLadysRestStop.s
+++ b/data/scripts/maps/Route111_OldLadysRestStop.s
diff --git a/data/maps/scripts/Route111_WinstrateFamilysHouse.s b/data/scripts/maps/Route111_WinstrateFamilysHouse.s
index b48269333..b48269333 100644
--- a/data/maps/scripts/Route111_WinstrateFamilysHouse.s
+++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.s
diff --git a/data/maps/scripts/Route112.s b/data/scripts/maps/Route112.s
index b97a28d75..b97a28d75 100644
--- a/data/maps/scripts/Route112.s
+++ b/data/scripts/maps/Route112.s
diff --git a/data/maps/scripts/Route112_CableCarStation.s b/data/scripts/maps/Route112_CableCarStation.s
index 4d4ab5c92..4d4ab5c92 100644
--- a/data/maps/scripts/Route112_CableCarStation.s
+++ b/data/scripts/maps/Route112_CableCarStation.s
diff --git a/data/maps/scripts/Route113.s b/data/scripts/maps/Route113.s
index d56e7c5d5..d56e7c5d5 100644
--- a/data/maps/scripts/Route113.s
+++ b/data/scripts/maps/Route113.s
diff --git a/data/maps/scripts/Route113_GlassWorkshop.s b/data/scripts/maps/Route113_GlassWorkshop.s
index 51a4b7b7e..51a4b7b7e 100644
--- a/data/maps/scripts/Route113_GlassWorkshop.s
+++ b/data/scripts/maps/Route113_GlassWorkshop.s
diff --git a/data/maps/scripts/Route114.s b/data/scripts/maps/Route114.s
index da590b8d6..da590b8d6 100644
--- a/data/maps/scripts/Route114.s
+++ b/data/scripts/maps/Route114.s
diff --git a/data/maps/scripts/Route114_FossilManiacsHouse.s b/data/scripts/maps/Route114_FossilManiacsHouse.s
index 71893af74..71893af74 100644
--- a/data/maps/scripts/Route114_FossilManiacsHouse.s
+++ b/data/scripts/maps/Route114_FossilManiacsHouse.s
diff --git a/data/maps/scripts/Route114_FossilManiacsTunnel.s b/data/scripts/maps/Route114_FossilManiacsTunnel.s
index b888a3a4c..b888a3a4c 100644
--- a/data/maps/scripts/Route114_FossilManiacsTunnel.s
+++ b/data/scripts/maps/Route114_FossilManiacsTunnel.s
diff --git a/data/maps/scripts/Route114_LanettesHouse.s b/data/scripts/maps/Route114_LanettesHouse.s
index 16cc31033..16cc31033 100644
--- a/data/maps/scripts/Route114_LanettesHouse.s
+++ b/data/scripts/maps/Route114_LanettesHouse.s
diff --git a/data/maps/scripts/Route115.s b/data/scripts/maps/Route115.s
index 5cc79447a..5cc79447a 100644
--- a/data/maps/scripts/Route115.s
+++ b/data/scripts/maps/Route115.s
diff --git a/data/maps/scripts/Route116.s b/data/scripts/maps/Route116.s
index c6c6e1cb1..c6c6e1cb1 100644
--- a/data/maps/scripts/Route116.s
+++ b/data/scripts/maps/Route116.s
diff --git a/data/maps/scripts/Route116_TunnelersRestHouse.s b/data/scripts/maps/Route116_TunnelersRestHouse.s
index 87e21addd..87e21addd 100644
--- a/data/maps/scripts/Route116_TunnelersRestHouse.s
+++ b/data/scripts/maps/Route116_TunnelersRestHouse.s
diff --git a/data/maps/scripts/Route117.s b/data/scripts/maps/Route117.s
index 232ed81d4..232ed81d4 100644
--- a/data/maps/scripts/Route117.s
+++ b/data/scripts/maps/Route117.s
diff --git a/data/maps/scripts/Route117_PokemonDayCare.s b/data/scripts/maps/Route117_PokemonDayCare.s
index 15435a631..15435a631 100644
--- a/data/maps/scripts/Route117_PokemonDayCare.s
+++ b/data/scripts/maps/Route117_PokemonDayCare.s
diff --git a/data/maps/scripts/Route118.s b/data/scripts/maps/Route118.s
index e2e685aba..e2e685aba 100644
--- a/data/maps/scripts/Route118.s
+++ b/data/scripts/maps/Route118.s
diff --git a/data/maps/scripts/Route119.s b/data/scripts/maps/Route119.s
index 22e8c1c84..22e8c1c84 100644
--- a/data/maps/scripts/Route119.s
+++ b/data/scripts/maps/Route119.s
diff --git a/data/maps/scripts/Route119_House.s b/data/scripts/maps/Route119_House.s
index b18ea7a6c..b18ea7a6c 100644
--- a/data/maps/scripts/Route119_House.s
+++ b/data/scripts/maps/Route119_House.s
diff --git a/data/maps/scripts/Route119_WeatherInstitute_1F.s b/data/scripts/maps/Route119_WeatherInstitute_1F.s
index f280086f6..f280086f6 100644
--- a/data/maps/scripts/Route119_WeatherInstitute_1F.s
+++ b/data/scripts/maps/Route119_WeatherInstitute_1F.s
diff --git a/data/maps/scripts/Route119_WeatherInstitute_2F.s b/data/scripts/maps/Route119_WeatherInstitute_2F.s
index deee98d09..deee98d09 100644
--- a/data/maps/scripts/Route119_WeatherInstitute_2F.s
+++ b/data/scripts/maps/Route119_WeatherInstitute_2F.s
diff --git a/data/maps/scripts/Route120.s b/data/scripts/maps/Route120.s
index e0ef91dc0..e0ef91dc0 100644
--- a/data/maps/scripts/Route120.s
+++ b/data/scripts/maps/Route120.s
diff --git a/data/maps/scripts/Route121.s b/data/scripts/maps/Route121.s
index 096e294d5..096e294d5 100644
--- a/data/maps/scripts/Route121.s
+++ b/data/scripts/maps/Route121.s
diff --git a/data/maps/scripts/Route121_SafariZoneEntrance.s b/data/scripts/maps/Route121_SafariZoneEntrance.s
index 9d5c12e26..9d5c12e26 100644
--- a/data/maps/scripts/Route121_SafariZoneEntrance.s
+++ b/data/scripts/maps/Route121_SafariZoneEntrance.s
diff --git a/data/maps/scripts/Route122.s b/data/scripts/maps/Route122.s
index 75718c2b1..75718c2b1 100644
--- a/data/maps/scripts/Route122.s
+++ b/data/scripts/maps/Route122.s
diff --git a/data/maps/scripts/Route123.s b/data/scripts/maps/Route123.s
index eb2ae5fcf..eb2ae5fcf 100644
--- a/data/maps/scripts/Route123.s
+++ b/data/scripts/maps/Route123.s
diff --git a/data/maps/scripts/Route123_BerryMastersHouse.s b/data/scripts/maps/Route123_BerryMastersHouse.s
index b1bfb5eaa..b1bfb5eaa 100644
--- a/data/maps/scripts/Route123_BerryMastersHouse.s
+++ b/data/scripts/maps/Route123_BerryMastersHouse.s
diff --git a/data/maps/scripts/Route124.s b/data/scripts/maps/Route124.s
index d0295dd37..d0295dd37 100644
--- a/data/maps/scripts/Route124.s
+++ b/data/scripts/maps/Route124.s
diff --git a/data/maps/scripts/Route124_DivingTreasureHuntersHouse.s b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.s
index 6e7a0a0df..6e7a0a0df 100644
--- a/data/maps/scripts/Route124_DivingTreasureHuntersHouse.s
+++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.s
diff --git a/data/maps/scripts/Route125.s b/data/scripts/maps/Route125.s
index 1c51c45ad..1c51c45ad 100644
--- a/data/maps/scripts/Route125.s
+++ b/data/scripts/maps/Route125.s
diff --git a/data/maps/scripts/Route126.s b/data/scripts/maps/Route126.s
index 574d05b98..574d05b98 100644
--- a/data/maps/scripts/Route126.s
+++ b/data/scripts/maps/Route126.s
diff --git a/data/maps/scripts/Route127.s b/data/scripts/maps/Route127.s
index 5beffdbcb..5beffdbcb 100644
--- a/data/maps/scripts/Route127.s
+++ b/data/scripts/maps/Route127.s
diff --git a/data/maps/scripts/Route128.s b/data/scripts/maps/Route128.s
index 00fc7c863..00fc7c863 100644
--- a/data/maps/scripts/Route128.s
+++ b/data/scripts/maps/Route128.s
diff --git a/data/maps/scripts/Route129.s b/data/scripts/maps/Route129.s
index c6b955df8..c6b955df8 100644
--- a/data/maps/scripts/Route129.s
+++ b/data/scripts/maps/Route129.s
diff --git a/data/maps/scripts/Route130.s b/data/scripts/maps/Route130.s
index c61f7e3b1..c61f7e3b1 100644
--- a/data/maps/scripts/Route130.s
+++ b/data/scripts/maps/Route130.s
diff --git a/data/maps/scripts/Route131.s b/data/scripts/maps/Route131.s
index fb344f59b..fb344f59b 100644
--- a/data/maps/scripts/Route131.s
+++ b/data/scripts/maps/Route131.s
diff --git a/data/maps/scripts/Route132.s b/data/scripts/maps/Route132.s
index bdeaad51e..bdeaad51e 100644
--- a/data/maps/scripts/Route132.s
+++ b/data/scripts/maps/Route132.s
diff --git a/data/maps/scripts/Route133.s b/data/scripts/maps/Route133.s
index 16d937782..16d937782 100644
--- a/data/maps/scripts/Route133.s
+++ b/data/scripts/maps/Route133.s
diff --git a/data/maps/scripts/Route134.s b/data/scripts/maps/Route134.s
index f1f738f88..f1f738f88 100644
--- a/data/maps/scripts/Route134.s
+++ b/data/scripts/maps/Route134.s
diff --git a/data/maps/scripts/RustboroCity.s b/data/scripts/maps/RustboroCity.s
index b7635286d..b7635286d 100644
--- a/data/maps/scripts/RustboroCity.s
+++ b/data/scripts/maps/RustboroCity.s
diff --git a/data/maps/scripts/RustboroCity_CuttersHouse.s b/data/scripts/maps/RustboroCity_CuttersHouse.s
index f75cc842f..f75cc842f 100644
--- a/data/maps/scripts/RustboroCity_CuttersHouse.s
+++ b/data/scripts/maps/RustboroCity_CuttersHouse.s
diff --git a/data/maps/scripts/RustboroCity_DevonCorp_1F.s b/data/scripts/maps/RustboroCity_DevonCorp_1F.s
index 3c55fb9bf..3c55fb9bf 100644
--- a/data/maps/scripts/RustboroCity_DevonCorp_1F.s
+++ b/data/scripts/maps/RustboroCity_DevonCorp_1F.s
diff --git a/data/maps/scripts/RustboroCity_DevonCorp_2F.s b/data/scripts/maps/RustboroCity_DevonCorp_2F.s
index cd05952fc..cd05952fc 100644
--- a/data/maps/scripts/RustboroCity_DevonCorp_2F.s
+++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.s
diff --git a/data/maps/scripts/RustboroCity_DevonCorp_3F.s b/data/scripts/maps/RustboroCity_DevonCorp_3F.s
index 99b5e782f..99b5e782f 100644
--- a/data/maps/scripts/RustboroCity_DevonCorp_3F.s
+++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.s
diff --git a/data/maps/scripts/RustboroCity_Flat1_1F.s b/data/scripts/maps/RustboroCity_Flat1_1F.s
index d84d2ba4f..d84d2ba4f 100644
--- a/data/maps/scripts/RustboroCity_Flat1_1F.s
+++ b/data/scripts/maps/RustboroCity_Flat1_1F.s
diff --git a/data/maps/scripts/RustboroCity_Flat1_2F.s b/data/scripts/maps/RustboroCity_Flat1_2F.s
index a682f160a..a682f160a 100644
--- a/data/maps/scripts/RustboroCity_Flat1_2F.s
+++ b/data/scripts/maps/RustboroCity_Flat1_2F.s
diff --git a/data/maps/scripts/RustboroCity_Flat2_1F.s b/data/scripts/maps/RustboroCity_Flat2_1F.s
index 088a6b16f..088a6b16f 100644
--- a/data/maps/scripts/RustboroCity_Flat2_1F.s
+++ b/data/scripts/maps/RustboroCity_Flat2_1F.s
diff --git a/data/maps/scripts/RustboroCity_Flat2_2F.s b/data/scripts/maps/RustboroCity_Flat2_2F.s
index bd8b0c9b7..bd8b0c9b7 100644
--- a/data/maps/scripts/RustboroCity_Flat2_2F.s
+++ b/data/scripts/maps/RustboroCity_Flat2_2F.s
diff --git a/data/maps/scripts/RustboroCity_Flat2_3F.s b/data/scripts/maps/RustboroCity_Flat2_3F.s
index 919609205..919609205 100644
--- a/data/maps/scripts/RustboroCity_Flat2_3F.s
+++ b/data/scripts/maps/RustboroCity_Flat2_3F.s
diff --git a/data/maps/scripts/RustboroCity_Gym.s b/data/scripts/maps/RustboroCity_Gym.s
index 0bf68a616..0bf68a616 100644
--- a/data/maps/scripts/RustboroCity_Gym.s
+++ b/data/scripts/maps/RustboroCity_Gym.s
diff --git a/data/maps/scripts/RustboroCity_House1.s b/data/scripts/maps/RustboroCity_House1.s
index 1eff4001e..1eff4001e 100644
--- a/data/maps/scripts/RustboroCity_House1.s
+++ b/data/scripts/maps/RustboroCity_House1.s
diff --git a/data/maps/scripts/RustboroCity_House2.s b/data/scripts/maps/RustboroCity_House2.s
index 66eeedf9b..66eeedf9b 100644
--- a/data/maps/scripts/RustboroCity_House2.s
+++ b/data/scripts/maps/RustboroCity_House2.s
diff --git a/data/maps/scripts/RustboroCity_House3.s b/data/scripts/maps/RustboroCity_House3.s
index 60978400e..60978400e 100644
--- a/data/maps/scripts/RustboroCity_House3.s
+++ b/data/scripts/maps/RustboroCity_House3.s
diff --git a/data/maps/scripts/RustboroCity_Mart.s b/data/scripts/maps/RustboroCity_Mart.s
index 245d02056..245d02056 100644
--- a/data/maps/scripts/RustboroCity_Mart.s
+++ b/data/scripts/maps/RustboroCity_Mart.s
diff --git a/data/maps/scripts/RustboroCity_PokemonCenter_1F.s b/data/scripts/maps/RustboroCity_PokemonCenter_1F.s
index 488c97722..488c97722 100644
--- a/data/maps/scripts/RustboroCity_PokemonCenter_1F.s
+++ b/data/scripts/maps/RustboroCity_PokemonCenter_1F.s
diff --git a/data/maps/scripts/RustboroCity_PokemonCenter_2F.s b/data/scripts/maps/RustboroCity_PokemonCenter_2F.s
index 6f983d651..6f983d651 100644
--- a/data/maps/scripts/RustboroCity_PokemonCenter_2F.s
+++ b/data/scripts/maps/RustboroCity_PokemonCenter_2F.s
diff --git a/data/maps/scripts/RustboroCity_PokemonSchool.s b/data/scripts/maps/RustboroCity_PokemonSchool.s
index af475848f..af475848f 100644
--- a/data/maps/scripts/RustboroCity_PokemonSchool.s
+++ b/data/scripts/maps/RustboroCity_PokemonSchool.s
diff --git a/data/maps/scripts/RusturfTunnel.s b/data/scripts/maps/RusturfTunnel.s
index cd920e333..cd920e333 100644
--- a/data/maps/scripts/RusturfTunnel.s
+++ b/data/scripts/maps/RusturfTunnel.s
diff --git a/data/maps/scripts/SSTidalCorridor.s b/data/scripts/maps/SSTidalCorridor.s
index f143d3261..f143d3261 100644
--- a/data/maps/scripts/SSTidalCorridor.s
+++ b/data/scripts/maps/SSTidalCorridor.s
diff --git a/data/maps/scripts/SSTidalLowerDeck.s b/data/scripts/maps/SSTidalLowerDeck.s
index f3dc6f0a0..f3dc6f0a0 100644
--- a/data/maps/scripts/SSTidalLowerDeck.s
+++ b/data/scripts/maps/SSTidalLowerDeck.s
diff --git a/data/maps/scripts/SSTidalRooms.s b/data/scripts/maps/SSTidalRooms.s
index 860b00a47..860b00a47 100644
--- a/data/maps/scripts/SSTidalRooms.s
+++ b/data/scripts/maps/SSTidalRooms.s
diff --git a/data/maps/scripts/SafariZone_Northeast.s b/data/scripts/maps/SafariZone_Northeast.s
index bb301e4fa..bb301e4fa 100644
--- a/data/maps/scripts/SafariZone_Northeast.s
+++ b/data/scripts/maps/SafariZone_Northeast.s
diff --git a/data/maps/scripts/SafariZone_Northwest.s b/data/scripts/maps/SafariZone_Northwest.s
index 4f30ad378..4f30ad378 100644
--- a/data/maps/scripts/SafariZone_Northwest.s
+++ b/data/scripts/maps/SafariZone_Northwest.s
diff --git a/data/maps/scripts/SafariZone_RestHouse.s b/data/scripts/maps/SafariZone_RestHouse.s
index ace6e6473..ace6e6473 100644
--- a/data/maps/scripts/SafariZone_RestHouse.s
+++ b/data/scripts/maps/SafariZone_RestHouse.s
diff --git a/data/maps/scripts/SafariZone_Southeast.s b/data/scripts/maps/SafariZone_Southeast.s
index 38fa96053..38fa96053 100644
--- a/data/maps/scripts/SafariZone_Southeast.s
+++ b/data/scripts/maps/SafariZone_Southeast.s
diff --git a/data/maps/scripts/SafariZone_Southwest.s b/data/scripts/maps/SafariZone_Southwest.s
index 158b8720f..158b8720f 100644
--- a/data/maps/scripts/SafariZone_Southwest.s
+++ b/data/scripts/maps/SafariZone_Southwest.s
diff --git a/data/maps/scripts/ScorchedSlab.s b/data/scripts/maps/ScorchedSlab.s
index bf5074e95..bf5074e95 100644
--- a/data/maps/scripts/ScorchedSlab.s
+++ b/data/scripts/maps/ScorchedSlab.s
diff --git a/data/maps/scripts/SeafloorCavern_Entrance.s b/data/scripts/maps/SeafloorCavern_Entrance.s
index 5f2788cf9..5f2788cf9 100644
--- a/data/maps/scripts/SeafloorCavern_Entrance.s
+++ b/data/scripts/maps/SeafloorCavern_Entrance.s
diff --git a/data/maps/scripts/SeafloorCavern_Room1.s b/data/scripts/maps/SeafloorCavern_Room1.s
index 4cc0ea0cd..4cc0ea0cd 100644
--- a/data/maps/scripts/SeafloorCavern_Room1.s
+++ b/data/scripts/maps/SeafloorCavern_Room1.s
diff --git a/data/maps/scripts/SeafloorCavern_Room2.s b/data/scripts/maps/SeafloorCavern_Room2.s
index cc53a220a..cc53a220a 100644
--- a/data/maps/scripts/SeafloorCavern_Room2.s
+++ b/data/scripts/maps/SeafloorCavern_Room2.s
diff --git a/data/maps/scripts/SeafloorCavern_Room3.s b/data/scripts/maps/SeafloorCavern_Room3.s
index 6d836adc7..6d836adc7 100644
--- a/data/maps/scripts/SeafloorCavern_Room3.s
+++ b/data/scripts/maps/SeafloorCavern_Room3.s
diff --git a/data/maps/scripts/SeafloorCavern_Room4.s b/data/scripts/maps/SeafloorCavern_Room4.s
index 1e79317c7..1e79317c7 100644
--- a/data/maps/scripts/SeafloorCavern_Room4.s
+++ b/data/scripts/maps/SeafloorCavern_Room4.s
diff --git a/data/maps/scripts/SeafloorCavern_Room5.s b/data/scripts/maps/SeafloorCavern_Room5.s
index 0bccaf57d..0bccaf57d 100644
--- a/data/maps/scripts/SeafloorCavern_Room5.s
+++ b/data/scripts/maps/SeafloorCavern_Room5.s
diff --git a/data/maps/scripts/SeafloorCavern_Room6.s b/data/scripts/maps/SeafloorCavern_Room6.s
index c765f7715..c765f7715 100644
--- a/data/maps/scripts/SeafloorCavern_Room6.s
+++ b/data/scripts/maps/SeafloorCavern_Room6.s
diff --git a/data/maps/scripts/SeafloorCavern_Room7.s b/data/scripts/maps/SeafloorCavern_Room7.s
index b0a2e1cd3..b0a2e1cd3 100644
--- a/data/maps/scripts/SeafloorCavern_Room7.s
+++ b/data/scripts/maps/SeafloorCavern_Room7.s
diff --git a/data/maps/scripts/SeafloorCavern_Room8.s b/data/scripts/maps/SeafloorCavern_Room8.s
index 48858c411..48858c411 100644
--- a/data/maps/scripts/SeafloorCavern_Room8.s
+++ b/data/scripts/maps/SeafloorCavern_Room8.s
diff --git a/data/maps/scripts/SeafloorCavern_Room9.s b/data/scripts/maps/SeafloorCavern_Room9.s
index 2308cbbf5..2308cbbf5 100644
--- a/data/maps/scripts/SeafloorCavern_Room9.s
+++ b/data/scripts/maps/SeafloorCavern_Room9.s
diff --git a/data/maps/scripts/SealedChamber_InnerRoom.s b/data/scripts/maps/SealedChamber_InnerRoom.s
index 42a6bfce7..42a6bfce7 100644
--- a/data/maps/scripts/SealedChamber_InnerRoom.s
+++ b/data/scripts/maps/SealedChamber_InnerRoom.s
diff --git a/data/maps/scripts/SealedChamber_OuterRoom.s b/data/scripts/maps/SealedChamber_OuterRoom.s
index ed7a5b6bd..ed7a5b6bd 100644
--- a/data/maps/scripts/SealedChamber_OuterRoom.s
+++ b/data/scripts/maps/SealedChamber_OuterRoom.s
diff --git a/data/maps/scripts/SecretBase_BlueCave1.s b/data/scripts/maps/SecretBase_BlueCave1.s
index bca6bee55..bca6bee55 100644
--- a/data/maps/scripts/SecretBase_BlueCave1.s
+++ b/data/scripts/maps/SecretBase_BlueCave1.s
diff --git a/data/maps/scripts/SecretBase_BlueCave2.s b/data/scripts/maps/SecretBase_BlueCave2.s
index 4fc579fb9..4fc579fb9 100644
--- a/data/maps/scripts/SecretBase_BlueCave2.s
+++ b/data/scripts/maps/SecretBase_BlueCave2.s
diff --git a/data/maps/scripts/SecretBase_BlueCave3.s b/data/scripts/maps/SecretBase_BlueCave3.s
index 0a8199f19..0a8199f19 100644
--- a/data/maps/scripts/SecretBase_BlueCave3.s
+++ b/data/scripts/maps/SecretBase_BlueCave3.s
diff --git a/data/maps/scripts/SecretBase_BlueCave4.s b/data/scripts/maps/SecretBase_BlueCave4.s
index 72c1e9612..72c1e9612 100644
--- a/data/maps/scripts/SecretBase_BlueCave4.s
+++ b/data/scripts/maps/SecretBase_BlueCave4.s
diff --git a/data/maps/scripts/SecretBase_BrownCave1.s b/data/scripts/maps/SecretBase_BrownCave1.s
index ddbf182e4..ddbf182e4 100644
--- a/data/maps/scripts/SecretBase_BrownCave1.s
+++ b/data/scripts/maps/SecretBase_BrownCave1.s
diff --git a/data/maps/scripts/SecretBase_BrownCave2.s b/data/scripts/maps/SecretBase_BrownCave2.s
index 06dcb6335..06dcb6335 100644
--- a/data/maps/scripts/SecretBase_BrownCave2.s
+++ b/data/scripts/maps/SecretBase_BrownCave2.s
diff --git a/data/maps/scripts/SecretBase_BrownCave3.s b/data/scripts/maps/SecretBase_BrownCave3.s
index a0a85dc11..a0a85dc11 100644
--- a/data/maps/scripts/SecretBase_BrownCave3.s
+++ b/data/scripts/maps/SecretBase_BrownCave3.s
diff --git a/data/maps/scripts/SecretBase_BrownCave4.s b/data/scripts/maps/SecretBase_BrownCave4.s
index 12d931e9e..12d931e9e 100644
--- a/data/maps/scripts/SecretBase_BrownCave4.s
+++ b/data/scripts/maps/SecretBase_BrownCave4.s
diff --git a/data/maps/scripts/SecretBase_RedCave1.s b/data/scripts/maps/SecretBase_RedCave1.s
index 77b99daec..77b99daec 100644
--- a/data/maps/scripts/SecretBase_RedCave1.s
+++ b/data/scripts/maps/SecretBase_RedCave1.s
diff --git a/data/maps/scripts/SecretBase_RedCave2.s b/data/scripts/maps/SecretBase_RedCave2.s
index 735d386fc..735d386fc 100644
--- a/data/maps/scripts/SecretBase_RedCave2.s
+++ b/data/scripts/maps/SecretBase_RedCave2.s
diff --git a/data/maps/scripts/SecretBase_RedCave3.s b/data/scripts/maps/SecretBase_RedCave3.s
index c9b72ca30..c9b72ca30 100644
--- a/data/maps/scripts/SecretBase_RedCave3.s
+++ b/data/scripts/maps/SecretBase_RedCave3.s
diff --git a/data/maps/scripts/SecretBase_RedCave4.s b/data/scripts/maps/SecretBase_RedCave4.s
index 6d2402f03..6d2402f03 100644
--- a/data/maps/scripts/SecretBase_RedCave4.s
+++ b/data/scripts/maps/SecretBase_RedCave4.s
diff --git a/data/maps/scripts/SecretBase_Shrub1.s b/data/scripts/maps/SecretBase_Shrub1.s
index 79116a0cf..79116a0cf 100644
--- a/data/maps/scripts/SecretBase_Shrub1.s
+++ b/data/scripts/maps/SecretBase_Shrub1.s
diff --git a/data/maps/scripts/SecretBase_Shrub2.s b/data/scripts/maps/SecretBase_Shrub2.s
index 49835f7f3..49835f7f3 100644
--- a/data/maps/scripts/SecretBase_Shrub2.s
+++ b/data/scripts/maps/SecretBase_Shrub2.s
diff --git a/data/maps/scripts/SecretBase_Shrub3.s b/data/scripts/maps/SecretBase_Shrub3.s
index 0aeb7bdf9..0aeb7bdf9 100644
--- a/data/maps/scripts/SecretBase_Shrub3.s
+++ b/data/scripts/maps/SecretBase_Shrub3.s
diff --git a/data/maps/scripts/SecretBase_Shrub4.s b/data/scripts/maps/SecretBase_Shrub4.s
index f131b308d..f131b308d 100644
--- a/data/maps/scripts/SecretBase_Shrub4.s
+++ b/data/scripts/maps/SecretBase_Shrub4.s
diff --git a/data/maps/scripts/SecretBase_Tree1.s b/data/scripts/maps/SecretBase_Tree1.s
index 7345c3bbb..7345c3bbb 100644
--- a/data/maps/scripts/SecretBase_Tree1.s
+++ b/data/scripts/maps/SecretBase_Tree1.s
diff --git a/data/maps/scripts/SecretBase_Tree2.s b/data/scripts/maps/SecretBase_Tree2.s
index 0f2976a8c..0f2976a8c 100644
--- a/data/maps/scripts/SecretBase_Tree2.s
+++ b/data/scripts/maps/SecretBase_Tree2.s
diff --git a/data/maps/scripts/SecretBase_Tree3.s b/data/scripts/maps/SecretBase_Tree3.s
index cb80b0d25..cb80b0d25 100644
--- a/data/maps/scripts/SecretBase_Tree3.s
+++ b/data/scripts/maps/SecretBase_Tree3.s
diff --git a/data/maps/scripts/SecretBase_Tree4.s b/data/scripts/maps/SecretBase_Tree4.s
index 0a6771740..0a6771740 100644
--- a/data/maps/scripts/SecretBase_Tree4.s
+++ b/data/scripts/maps/SecretBase_Tree4.s
diff --git a/data/maps/scripts/SecretBase_YellowCave1.s b/data/scripts/maps/SecretBase_YellowCave1.s
index b76a5f44e..b76a5f44e 100644
--- a/data/maps/scripts/SecretBase_YellowCave1.s
+++ b/data/scripts/maps/SecretBase_YellowCave1.s
diff --git a/data/maps/scripts/SecretBase_YellowCave2.s b/data/scripts/maps/SecretBase_YellowCave2.s
index 0bc1fc354..0bc1fc354 100644
--- a/data/maps/scripts/SecretBase_YellowCave2.s
+++ b/data/scripts/maps/SecretBase_YellowCave2.s
diff --git a/data/maps/scripts/SecretBase_YellowCave3.s b/data/scripts/maps/SecretBase_YellowCave3.s
index 137f04316..137f04316 100644
--- a/data/maps/scripts/SecretBase_YellowCave3.s
+++ b/data/scripts/maps/SecretBase_YellowCave3.s
diff --git a/data/maps/scripts/SecretBase_YellowCave4.s b/data/scripts/maps/SecretBase_YellowCave4.s
index 7f6ba9644..7f6ba9644 100644
--- a/data/maps/scripts/SecretBase_YellowCave4.s
+++ b/data/scripts/maps/SecretBase_YellowCave4.s
diff --git a/data/maps/scripts/ShoalCave_HighTideEntranceRoom.s b/data/scripts/maps/ShoalCave_HighTideEntranceRoom.s
index 7e9c3cea2..7e9c3cea2 100644
--- a/data/maps/scripts/ShoalCave_HighTideEntranceRoom.s
+++ b/data/scripts/maps/ShoalCave_HighTideEntranceRoom.s
diff --git a/data/maps/scripts/ShoalCave_HighTideInnerRoom.s b/data/scripts/maps/ShoalCave_HighTideInnerRoom.s
index ed506a50e..ed506a50e 100644
--- a/data/maps/scripts/ShoalCave_HighTideInnerRoom.s
+++ b/data/scripts/maps/ShoalCave_HighTideInnerRoom.s
diff --git a/data/maps/scripts/ShoalCave_LowTideEntranceRoom.s b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.s
index f44c79dfe..f44c79dfe 100644
--- a/data/maps/scripts/ShoalCave_LowTideEntranceRoom.s
+++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.s
diff --git a/data/maps/scripts/ShoalCave_LowTideIceRoom.s b/data/scripts/maps/ShoalCave_LowTideIceRoom.s
index 1290d6efd..1290d6efd 100644
--- a/data/maps/scripts/ShoalCave_LowTideIceRoom.s
+++ b/data/scripts/maps/ShoalCave_LowTideIceRoom.s
diff --git a/data/maps/scripts/ShoalCave_LowTideInnerRoom.s b/data/scripts/maps/ShoalCave_LowTideInnerRoom.s
index d00193e42..d00193e42 100644
--- a/data/maps/scripts/ShoalCave_LowTideInnerRoom.s
+++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.s
diff --git a/data/maps/scripts/ShoalCave_LowTideLowerRoom.s b/data/scripts/maps/ShoalCave_LowTideLowerRoom.s
index 4ffed780e..4ffed780e 100644
--- a/data/maps/scripts/ShoalCave_LowTideLowerRoom.s
+++ b/data/scripts/maps/ShoalCave_LowTideLowerRoom.s
diff --git a/data/maps/scripts/ShoalCave_LowTideStairsRoom.s b/data/scripts/maps/ShoalCave_LowTideStairsRoom.s
index bf660eaa4..bf660eaa4 100644
--- a/data/maps/scripts/ShoalCave_LowTideStairsRoom.s
+++ b/data/scripts/maps/ShoalCave_LowTideStairsRoom.s
diff --git a/data/maps/scripts/SingleBattleColosseum.s b/data/scripts/maps/SingleBattleColosseum.s
index 270e4b670..270e4b670 100644
--- a/data/maps/scripts/SingleBattleColosseum.s
+++ b/data/scripts/maps/SingleBattleColosseum.s
diff --git a/data/maps/scripts/SkyPillar_1F.s b/data/scripts/maps/SkyPillar_1F.s
index 6afcecf08..6afcecf08 100644
--- a/data/maps/scripts/SkyPillar_1F.s
+++ b/data/scripts/maps/SkyPillar_1F.s
diff --git a/data/maps/scripts/SkyPillar_2F.s b/data/scripts/maps/SkyPillar_2F.s
index 7a473a795..7a473a795 100644
--- a/data/maps/scripts/SkyPillar_2F.s
+++ b/data/scripts/maps/SkyPillar_2F.s
diff --git a/data/maps/scripts/SkyPillar_3F.s b/data/scripts/maps/SkyPillar_3F.s
index 6b0afa4d0..6b0afa4d0 100644
--- a/data/maps/scripts/SkyPillar_3F.s
+++ b/data/scripts/maps/SkyPillar_3F.s
diff --git a/data/maps/scripts/SkyPillar_4F.s b/data/scripts/maps/SkyPillar_4F.s
index 22128480c..22128480c 100644
--- a/data/maps/scripts/SkyPillar_4F.s
+++ b/data/scripts/maps/SkyPillar_4F.s
diff --git a/data/maps/scripts/SkyPillar_5F.s b/data/scripts/maps/SkyPillar_5F.s
index cf0e60ecb..cf0e60ecb 100644
--- a/data/maps/scripts/SkyPillar_5F.s
+++ b/data/scripts/maps/SkyPillar_5F.s
diff --git a/data/maps/scripts/SkyPillar_Entrance.s b/data/scripts/maps/SkyPillar_Entrance.s
index 09eb538c9..09eb538c9 100644
--- a/data/maps/scripts/SkyPillar_Entrance.s
+++ b/data/scripts/maps/SkyPillar_Entrance.s
diff --git a/data/maps/scripts/SkyPillar_Outside.s b/data/scripts/maps/SkyPillar_Outside.s
index 338593de7..338593de7 100644
--- a/data/maps/scripts/SkyPillar_Outside.s
+++ b/data/scripts/maps/SkyPillar_Outside.s
diff --git a/data/maps/scripts/SkyPillar_Top.s b/data/scripts/maps/SkyPillar_Top.s
index 970725bf8..970725bf8 100644
--- a/data/maps/scripts/SkyPillar_Top.s
+++ b/data/scripts/maps/SkyPillar_Top.s
diff --git a/data/maps/scripts/SlateportCity.s b/data/scripts/maps/SlateportCity.s
index 47db3a3fa..47db3a3fa 100644
--- a/data/maps/scripts/SlateportCity.s
+++ b/data/scripts/maps/SlateportCity.s
diff --git a/data/maps/scripts/SlateportCity_ContestHall.s b/data/scripts/maps/SlateportCity_ContestHall.s
index 2e33c1ec5..2e33c1ec5 100644
--- a/data/maps/scripts/SlateportCity_ContestHall.s
+++ b/data/scripts/maps/SlateportCity_ContestHall.s
diff --git a/data/maps/scripts/SlateportCity_ContestLobby.s b/data/scripts/maps/SlateportCity_ContestLobby.s
index 871f95f33..871f95f33 100644
--- a/data/maps/scripts/SlateportCity_ContestLobby.s
+++ b/data/scripts/maps/SlateportCity_ContestLobby.s
diff --git a/data/maps/scripts/SlateportCity_Harbor.s b/data/scripts/maps/SlateportCity_Harbor.s
index 8bdccdbb9..8bdccdbb9 100644
--- a/data/maps/scripts/SlateportCity_Harbor.s
+++ b/data/scripts/maps/SlateportCity_Harbor.s
diff --git a/data/maps/scripts/SlateportCity_House1.s b/data/scripts/maps/SlateportCity_House1.s
index bde33129c..bde33129c 100644
--- a/data/maps/scripts/SlateportCity_House1.s
+++ b/data/scripts/maps/SlateportCity_House1.s
diff --git a/data/maps/scripts/SlateportCity_House2.s b/data/scripts/maps/SlateportCity_House2.s
index 87581ceaf..87581ceaf 100644
--- a/data/maps/scripts/SlateportCity_House2.s
+++ b/data/scripts/maps/SlateportCity_House2.s
diff --git a/data/maps/scripts/SlateportCity_Mart.s b/data/scripts/maps/SlateportCity_Mart.s
index f2c8f029b..f2c8f029b 100644
--- a/data/maps/scripts/SlateportCity_Mart.s
+++ b/data/scripts/maps/SlateportCity_Mart.s
diff --git a/data/maps/scripts/SlateportCity_OceanicMuseum_1F.s b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.s
index 10dcb66d8..10dcb66d8 100644
--- a/data/maps/scripts/SlateportCity_OceanicMuseum_1F.s
+++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.s
diff --git a/data/maps/scripts/SlateportCity_OceanicMuseum_2F.s b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.s
index 28b098126..28b098126 100644
--- a/data/maps/scripts/SlateportCity_OceanicMuseum_2F.s
+++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.s
diff --git a/data/maps/scripts/SlateportCity_PokemonCenter_1F.s b/data/scripts/maps/SlateportCity_PokemonCenter_1F.s
index a8ef51f52..a8ef51f52 100644
--- a/data/maps/scripts/SlateportCity_PokemonCenter_1F.s
+++ b/data/scripts/maps/SlateportCity_PokemonCenter_1F.s
diff --git a/data/maps/scripts/SlateportCity_PokemonCenter_2F.s b/data/scripts/maps/SlateportCity_PokemonCenter_2F.s
index 1f5216d11..1f5216d11 100644
--- a/data/maps/scripts/SlateportCity_PokemonCenter_2F.s
+++ b/data/scripts/maps/SlateportCity_PokemonCenter_2F.s
diff --git a/data/maps/scripts/SlateportCity_PokemonFanClub.s b/data/scripts/maps/SlateportCity_PokemonFanClub.s
index ecaf833e8..ecaf833e8 100644
--- a/data/maps/scripts/SlateportCity_PokemonFanClub.s
+++ b/data/scripts/maps/SlateportCity_PokemonFanClub.s
diff --git a/data/maps/scripts/SlateportCity_SternsShipyard_1F.s b/data/scripts/maps/SlateportCity_SternsShipyard_1F.s
index 64c81d3c4..64c81d3c4 100644
--- a/data/maps/scripts/SlateportCity_SternsShipyard_1F.s
+++ b/data/scripts/maps/SlateportCity_SternsShipyard_1F.s
diff --git a/data/maps/scripts/SlateportCity_SternsShipyard_2F.s b/data/scripts/maps/SlateportCity_SternsShipyard_2F.s
index 069b5c9f8..069b5c9f8 100644
--- a/data/maps/scripts/SlateportCity_SternsShipyard_2F.s
+++ b/data/scripts/maps/SlateportCity_SternsShipyard_2F.s
diff --git a/data/maps/scripts/SootopolisCity.s b/data/scripts/maps/SootopolisCity.s
index 1690b8104..1690b8104 100644
--- a/data/maps/scripts/SootopolisCity.s
+++ b/data/scripts/maps/SootopolisCity.s
diff --git a/data/maps/scripts/SootopolisCity_Gym_1F.s b/data/scripts/maps/SootopolisCity_Gym_1F.s
index fa52b4da3..fa52b4da3 100644
--- a/data/maps/scripts/SootopolisCity_Gym_1F.s
+++ b/data/scripts/maps/SootopolisCity_Gym_1F.s
diff --git a/data/maps/scripts/SootopolisCity_Gym_B1F.s b/data/scripts/maps/SootopolisCity_Gym_B1F.s
index 21bbc1558..21bbc1558 100644
--- a/data/maps/scripts/SootopolisCity_Gym_B1F.s
+++ b/data/scripts/maps/SootopolisCity_Gym_B1F.s
diff --git a/data/maps/scripts/SootopolisCity_House1.s b/data/scripts/maps/SootopolisCity_House1.s
index a2243206c..a2243206c 100644
--- a/data/maps/scripts/SootopolisCity_House1.s
+++ b/data/scripts/maps/SootopolisCity_House1.s
diff --git a/data/maps/scripts/SootopolisCity_House2.s b/data/scripts/maps/SootopolisCity_House2.s
index cb99f1004..cb99f1004 100644
--- a/data/maps/scripts/SootopolisCity_House2.s
+++ b/data/scripts/maps/SootopolisCity_House2.s
diff --git a/data/maps/scripts/SootopolisCity_House3.s b/data/scripts/maps/SootopolisCity_House3.s
index 7ebfa3787..7ebfa3787 100644
--- a/data/maps/scripts/SootopolisCity_House3.s
+++ b/data/scripts/maps/SootopolisCity_House3.s
diff --git a/data/maps/scripts/SootopolisCity_House4.s b/data/scripts/maps/SootopolisCity_House4.s
index f8fdd8b4b..f8fdd8b4b 100644
--- a/data/maps/scripts/SootopolisCity_House4.s
+++ b/data/scripts/maps/SootopolisCity_House4.s
diff --git a/data/maps/scripts/SootopolisCity_House5.s b/data/scripts/maps/SootopolisCity_House5.s
index b42855160..b42855160 100644
--- a/data/maps/scripts/SootopolisCity_House5.s
+++ b/data/scripts/maps/SootopolisCity_House5.s
diff --git a/data/maps/scripts/SootopolisCity_House6.s b/data/scripts/maps/SootopolisCity_House6.s
index 429d0c438..429d0c438 100644
--- a/data/maps/scripts/SootopolisCity_House6.s
+++ b/data/scripts/maps/SootopolisCity_House6.s
diff --git a/data/maps/scripts/SootopolisCity_House7.s b/data/scripts/maps/SootopolisCity_House7.s
index 889f8993d..889f8993d 100644
--- a/data/maps/scripts/SootopolisCity_House7.s
+++ b/data/scripts/maps/SootopolisCity_House7.s
diff --git a/data/maps/scripts/SootopolisCity_House8.s b/data/scripts/maps/SootopolisCity_House8.s
index 0f9ee3580..0f9ee3580 100644
--- a/data/maps/scripts/SootopolisCity_House8.s
+++ b/data/scripts/maps/SootopolisCity_House8.s
diff --git a/data/maps/scripts/SootopolisCity_Mart.s b/data/scripts/maps/SootopolisCity_Mart.s
index 7dcb0e274..7dcb0e274 100644
--- a/data/maps/scripts/SootopolisCity_Mart.s
+++ b/data/scripts/maps/SootopolisCity_Mart.s
diff --git a/data/maps/scripts/SootopolisCity_PokemonCenter_1F.s b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.s
index 1221fb845..1221fb845 100644
--- a/data/maps/scripts/SootopolisCity_PokemonCenter_1F.s
+++ b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.s
diff --git a/data/maps/scripts/SootopolisCity_PokemonCenter_2F.s b/data/scripts/maps/SootopolisCity_PokemonCenter_2F.s
index 2046a9042..2046a9042 100644
--- a/data/maps/scripts/SootopolisCity_PokemonCenter_2F.s
+++ b/data/scripts/maps/SootopolisCity_PokemonCenter_2F.s
diff --git a/data/maps/scripts/SouthernIsland_Exterior.s b/data/scripts/maps/SouthernIsland_Exterior.s
index 9723647cd..9723647cd 100644
--- a/data/maps/scripts/SouthernIsland_Exterior.s
+++ b/data/scripts/maps/SouthernIsland_Exterior.s
diff --git a/data/maps/scripts/SouthernIsland_Interior.s b/data/scripts/maps/SouthernIsland_Interior.s
index 63e5b78a9..63e5b78a9 100644
--- a/data/maps/scripts/SouthernIsland_Interior.s
+++ b/data/scripts/maps/SouthernIsland_Interior.s
diff --git a/data/maps/scripts/TradeCenter.s b/data/scripts/maps/TradeCenter.s
index 44efcf62f..44efcf62f 100644
--- a/data/maps/scripts/TradeCenter.s
+++ b/data/scripts/maps/TradeCenter.s
diff --git a/data/maps/scripts/Underwater1.s b/data/scripts/maps/Underwater1.s
index aedbe82c4..aedbe82c4 100644
--- a/data/maps/scripts/Underwater1.s
+++ b/data/scripts/maps/Underwater1.s
diff --git a/data/maps/scripts/Underwater2.s b/data/scripts/maps/Underwater2.s
index 4da2a5cb2..4da2a5cb2 100644
--- a/data/maps/scripts/Underwater2.s
+++ b/data/scripts/maps/Underwater2.s
diff --git a/data/maps/scripts/Underwater3.s b/data/scripts/maps/Underwater3.s
index b87c72c9f..b87c72c9f 100644
--- a/data/maps/scripts/Underwater3.s
+++ b/data/scripts/maps/Underwater3.s
diff --git a/data/maps/scripts/Underwater4.s b/data/scripts/maps/Underwater4.s
index a6d8f1bd0..a6d8f1bd0 100644
--- a/data/maps/scripts/Underwater4.s
+++ b/data/scripts/maps/Underwater4.s
diff --git a/data/maps/scripts/Underwater_Route134.s b/data/scripts/maps/Underwater_Route134.s
index 427481eda..427481eda 100644
--- a/data/maps/scripts/Underwater_Route134.s
+++ b/data/scripts/maps/Underwater_Route134.s
diff --git a/data/maps/scripts/Underwater_SeafloorCavern.s b/data/scripts/maps/Underwater_SeafloorCavern.s
index 4a0388146..4a0388146 100644
--- a/data/maps/scripts/Underwater_SeafloorCavern.s
+++ b/data/scripts/maps/Underwater_SeafloorCavern.s
diff --git a/data/maps/scripts/Underwater_SealedChamber.s b/data/scripts/maps/Underwater_SealedChamber.s
index 8e790ddc0..8e790ddc0 100644
--- a/data/maps/scripts/Underwater_SealedChamber.s
+++ b/data/scripts/maps/Underwater_SealedChamber.s
diff --git a/data/maps/scripts/Underwater_SootopolisCity.s b/data/scripts/maps/Underwater_SootopolisCity.s
index aa3465cb7..aa3465cb7 100644
--- a/data/maps/scripts/Underwater_SootopolisCity.s
+++ b/data/scripts/maps/Underwater_SootopolisCity.s
diff --git a/data/maps/scripts/UnknownMap_25_29.s b/data/scripts/maps/UnknownMap_25_29.s
index a62e0c9f3..a62e0c9f3 100644
--- a/data/maps/scripts/UnknownMap_25_29.s
+++ b/data/scripts/maps/UnknownMap_25_29.s
diff --git a/data/maps/scripts/UnknownMap_25_30.s b/data/scripts/maps/UnknownMap_25_30.s
index 70a1f0ac2..70a1f0ac2 100644
--- a/data/maps/scripts/UnknownMap_25_30.s
+++ b/data/scripts/maps/UnknownMap_25_30.s
diff --git a/data/maps/scripts/UnknownMap_25_31.s b/data/scripts/maps/UnknownMap_25_31.s
index 44c67cab5..44c67cab5 100644
--- a/data/maps/scripts/UnknownMap_25_31.s
+++ b/data/scripts/maps/UnknownMap_25_31.s
diff --git a/data/maps/scripts/UnknownMap_25_32.s b/data/scripts/maps/UnknownMap_25_32.s
index 485a626e6..485a626e6 100644
--- a/data/maps/scripts/UnknownMap_25_32.s
+++ b/data/scripts/maps/UnknownMap_25_32.s
diff --git a/data/maps/scripts/UnknownMap_25_33.s b/data/scripts/maps/UnknownMap_25_33.s
index 68feb9cc6..68feb9cc6 100644
--- a/data/maps/scripts/UnknownMap_25_33.s
+++ b/data/scripts/maps/UnknownMap_25_33.s
diff --git a/data/maps/scripts/UnknownMap_25_34.s b/data/scripts/maps/UnknownMap_25_34.s
index 3fc7b181a..3fc7b181a 100644
--- a/data/maps/scripts/UnknownMap_25_34.s
+++ b/data/scripts/maps/UnknownMap_25_34.s
diff --git a/data/maps/scripts/VerdanturfTown.s b/data/scripts/maps/VerdanturfTown.s
index 6b702a243..6b702a243 100644
--- a/data/maps/scripts/VerdanturfTown.s
+++ b/data/scripts/maps/VerdanturfTown.s
diff --git a/data/maps/scripts/VerdanturfTown_ContestHall.s b/data/scripts/maps/VerdanturfTown_ContestHall.s
index fe4f91cef..fe4f91cef 100644
--- a/data/maps/scripts/VerdanturfTown_ContestHall.s
+++ b/data/scripts/maps/VerdanturfTown_ContestHall.s
diff --git a/data/maps/scripts/VerdanturfTown_ContestLobby.s b/data/scripts/maps/VerdanturfTown_ContestLobby.s
index 2f0d74896..2f0d74896 100644
--- a/data/maps/scripts/VerdanturfTown_ContestLobby.s
+++ b/data/scripts/maps/VerdanturfTown_ContestLobby.s
diff --git a/data/maps/scripts/VerdanturfTown_FriendshipRatersHouse.s b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.s
index f2b561733..f2b561733 100644
--- a/data/maps/scripts/VerdanturfTown_FriendshipRatersHouse.s
+++ b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.s
diff --git a/data/maps/scripts/VerdanturfTown_House.s b/data/scripts/maps/VerdanturfTown_House.s
index fc9f5ffd9..fc9f5ffd9 100644
--- a/data/maps/scripts/VerdanturfTown_House.s
+++ b/data/scripts/maps/VerdanturfTown_House.s
diff --git a/data/maps/scripts/VerdanturfTown_Mart.s b/data/scripts/maps/VerdanturfTown_Mart.s
index 08634cb85..08634cb85 100644
--- a/data/maps/scripts/VerdanturfTown_Mart.s
+++ b/data/scripts/maps/VerdanturfTown_Mart.s
diff --git a/data/maps/scripts/VerdanturfTown_PokemonCenter_1F.s b/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.s
index 7b8dcfc8f..7b8dcfc8f 100644
--- a/data/maps/scripts/VerdanturfTown_PokemonCenter_1F.s
+++ b/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.s
diff --git a/data/maps/scripts/VerdanturfTown_PokemonCenter_2F.s b/data/scripts/maps/VerdanturfTown_PokemonCenter_2F.s
index 113e3cfee..113e3cfee 100644
--- a/data/maps/scripts/VerdanturfTown_PokemonCenter_2F.s
+++ b/data/scripts/maps/VerdanturfTown_PokemonCenter_2F.s
diff --git a/data/maps/scripts/VerdanturfTown_WandasHouse.s b/data/scripts/maps/VerdanturfTown_WandasHouse.s
index eb497c426..eb497c426 100644
--- a/data/maps/scripts/VerdanturfTown_WandasHouse.s
+++ b/data/scripts/maps/VerdanturfTown_WandasHouse.s
diff --git a/data/maps/scripts/VictoryRoad_1F.s b/data/scripts/maps/VictoryRoad_1F.s
index 88865f4eb..88865f4eb 100644
--- a/data/maps/scripts/VictoryRoad_1F.s
+++ b/data/scripts/maps/VictoryRoad_1F.s
diff --git a/data/maps/scripts/VictoryRoad_B1F.s b/data/scripts/maps/VictoryRoad_B1F.s
index a4f40b815..a4f40b815 100644
--- a/data/maps/scripts/VictoryRoad_B1F.s
+++ b/data/scripts/maps/VictoryRoad_B1F.s
diff --git a/data/maps/scripts/VictoryRoad_B2F.s b/data/scripts/maps/VictoryRoad_B2F.s
index 39ac84e92..39ac84e92 100644
--- a/data/maps/scripts/VictoryRoad_B2F.s
+++ b/data/scripts/maps/VictoryRoad_B2F.s
diff --git a/data/maps/text/AbandonedShip_CaptainsOffice.s b/data/text/maps/AbandonedShip_CaptainsOffice.s
index 69d09ed99..69d09ed99 100644
--- a/data/maps/text/AbandonedShip_CaptainsOffice.s
+++ b/data/text/maps/AbandonedShip_CaptainsOffice.s
diff --git a/data/maps/text/AbandonedShip_Corridors_1F.s b/data/text/maps/AbandonedShip_Corridors_1F.s
index 9a96e04f9..9a96e04f9 100644
--- a/data/maps/text/AbandonedShip_Corridors_1F.s
+++ b/data/text/maps/AbandonedShip_Corridors_1F.s
diff --git a/data/maps/text/AbandonedShip_Corridors_B1F.s b/data/text/maps/AbandonedShip_Corridors_B1F.s
index 887a6c11a..887a6c11a 100644
--- a/data/maps/text/AbandonedShip_Corridors_B1F.s
+++ b/data/text/maps/AbandonedShip_Corridors_B1F.s
diff --git a/data/maps/text/AbandonedShip_HiddenFloorCorridors.s b/data/text/maps/AbandonedShip_HiddenFloorCorridors.s
index 8e43b2462..8e43b2462 100644
--- a/data/maps/text/AbandonedShip_HiddenFloorCorridors.s
+++ b/data/text/maps/AbandonedShip_HiddenFloorCorridors.s
diff --git a/data/maps/text/AbandonedShip_HiddenFloorRooms.s b/data/text/maps/AbandonedShip_HiddenFloorRooms.s
index 1be9f8f02..1be9f8f02 100644
--- a/data/maps/text/AbandonedShip_HiddenFloorRooms.s
+++ b/data/text/maps/AbandonedShip_HiddenFloorRooms.s
diff --git a/data/maps/text/AbandonedShip_Rooms2_1F.s b/data/text/maps/AbandonedShip_Rooms2_1F.s
index d7fce3236..d7fce3236 100644
--- a/data/maps/text/AbandonedShip_Rooms2_1F.s
+++ b/data/text/maps/AbandonedShip_Rooms2_1F.s
diff --git a/data/maps/text/AbandonedShip_Rooms2_B1F.s b/data/text/maps/AbandonedShip_Rooms2_B1F.s
index 7e868b335..7e868b335 100644
--- a/data/maps/text/AbandonedShip_Rooms2_B1F.s
+++ b/data/text/maps/AbandonedShip_Rooms2_B1F.s
diff --git a/data/maps/text/AbandonedShip_Rooms_1F.s b/data/text/maps/AbandonedShip_Rooms_1F.s
index f6e5c729f..f6e5c729f 100644
--- a/data/maps/text/AbandonedShip_Rooms_1F.s
+++ b/data/text/maps/AbandonedShip_Rooms_1F.s
diff --git a/data/maps/text/AbandonedShip_Rooms_B1F.s b/data/text/maps/AbandonedShip_Rooms_B1F.s
index 9ecf30a2b..9ecf30a2b 100644
--- a/data/maps/text/AbandonedShip_Rooms_B1F.s
+++ b/data/text/maps/AbandonedShip_Rooms_B1F.s
diff --git a/data/maps/text/AncientTomb.s b/data/text/maps/AncientTomb.s
index ca85352f0..ca85352f0 100644
--- a/data/maps/text/AncientTomb.s
+++ b/data/text/maps/AncientTomb.s
diff --git a/data/maps/text/AquaHideout_1F.s b/data/text/maps/AquaHideout_1F.s
index f5539e687..f5539e687 100644
--- a/data/maps/text/AquaHideout_1F.s
+++ b/data/text/maps/AquaHideout_1F.s
diff --git a/data/maps/text/AquaHideout_B1F.s b/data/text/maps/AquaHideout_B1F.s
index f62c08e76..f62c08e76 100644
--- a/data/maps/text/AquaHideout_B1F.s
+++ b/data/text/maps/AquaHideout_B1F.s
diff --git a/data/maps/text/AquaHideout_B2F.s b/data/text/maps/AquaHideout_B2F.s
index 230afe36c..230afe36c 100644
--- a/data/maps/text/AquaHideout_B2F.s
+++ b/data/text/maps/AquaHideout_B2F.s
diff --git a/data/maps/text/BattleTower_BattleRoom.s b/data/text/maps/BattleTower_BattleRoom.s
index f78ffcc81..f78ffcc81 100644
--- a/data/maps/text/BattleTower_BattleRoom.s
+++ b/data/text/maps/BattleTower_BattleRoom.s
diff --git a/data/maps/text/BattleTower_Lobby.s b/data/text/maps/BattleTower_Lobby.s
index 832041e86..832041e86 100644
--- a/data/maps/text/BattleTower_Lobby.s
+++ b/data/text/maps/BattleTower_Lobby.s
diff --git a/data/maps/text/BattleTower_Outside.s b/data/text/maps/BattleTower_Outside.s
index ef8be00de..ef8be00de 100644
--- a/data/maps/text/BattleTower_Outside.s
+++ b/data/text/maps/BattleTower_Outside.s
diff --git a/data/maps/text/CaveOfOrigin_B4F.s b/data/text/maps/CaveOfOrigin_B4F.s
index 6d59f8971..6d59f8971 100644
--- a/data/maps/text/CaveOfOrigin_B4F.s
+++ b/data/text/maps/CaveOfOrigin_B4F.s
diff --git a/data/maps/text/DesertRuins.s b/data/text/maps/DesertRuins.s
index 528e4c8e2..528e4c8e2 100644
--- a/data/maps/text/DesertRuins.s
+++ b/data/text/maps/DesertRuins.s
diff --git a/data/maps/text/DewfordTown.s b/data/text/maps/DewfordTown.s
index a39dcc4c2..a39dcc4c2 100644
--- a/data/maps/text/DewfordTown.s
+++ b/data/text/maps/DewfordTown.s
diff --git a/data/maps/text/DewfordTown_Gym.s b/data/text/maps/DewfordTown_Gym.s
index 904e6c338..904e6c338 100644
--- a/data/maps/text/DewfordTown_Gym.s
+++ b/data/text/maps/DewfordTown_Gym.s
diff --git a/data/maps/text/DewfordTown_Hall.s b/data/text/maps/DewfordTown_Hall.s
index 6023984a4..6023984a4 100644
--- a/data/maps/text/DewfordTown_Hall.s
+++ b/data/text/maps/DewfordTown_Hall.s
diff --git a/data/maps/text/DewfordTown_House1.s b/data/text/maps/DewfordTown_House1.s
index 8f6324636..8f6324636 100644
--- a/data/maps/text/DewfordTown_House1.s
+++ b/data/text/maps/DewfordTown_House1.s
diff --git a/data/maps/text/DewfordTown_House2.s b/data/text/maps/DewfordTown_House2.s
index daa41a12c..daa41a12c 100644
--- a/data/maps/text/DewfordTown_House2.s
+++ b/data/text/maps/DewfordTown_House2.s
diff --git a/data/maps/text/DewfordTown_PokemonCenter_1F.s b/data/text/maps/DewfordTown_PokemonCenter_1F.s
index de56f404e..de56f404e 100644
--- a/data/maps/text/DewfordTown_PokemonCenter_1F.s
+++ b/data/text/maps/DewfordTown_PokemonCenter_1F.s
diff --git a/data/maps/text/EverGrandeCity.s b/data/text/maps/EverGrandeCity.s
index 31e53ef90..31e53ef90 100644
--- a/data/maps/text/EverGrandeCity.s
+++ b/data/text/maps/EverGrandeCity.s
diff --git a/data/maps/text/EverGrandeCity_ChampionsRoom.s b/data/text/maps/EverGrandeCity_ChampionsRoom.s
index 82ccb7e4f..82ccb7e4f 100644
--- a/data/maps/text/EverGrandeCity_ChampionsRoom.s
+++ b/data/text/maps/EverGrandeCity_ChampionsRoom.s
diff --git a/data/maps/text/EverGrandeCity_DrakesRoom.s b/data/text/maps/EverGrandeCity_DrakesRoom.s
index d3c83c885..d3c83c885 100644
--- a/data/maps/text/EverGrandeCity_DrakesRoom.s
+++ b/data/text/maps/EverGrandeCity_DrakesRoom.s
diff --git a/data/maps/text/EverGrandeCity_GlaciasRoom.s b/data/text/maps/EverGrandeCity_GlaciasRoom.s
index a25070dca..a25070dca 100644
--- a/data/maps/text/EverGrandeCity_GlaciasRoom.s
+++ b/data/text/maps/EverGrandeCity_GlaciasRoom.s
diff --git a/data/maps/text/EverGrandeCity_HallOfFame.s b/data/text/maps/EverGrandeCity_HallOfFame.s
index 5b6701471..5b6701471 100644
--- a/data/maps/text/EverGrandeCity_HallOfFame.s
+++ b/data/text/maps/EverGrandeCity_HallOfFame.s
diff --git a/data/maps/text/EverGrandeCity_PhoebesRoom.s b/data/text/maps/EverGrandeCity_PhoebesRoom.s
index 047390a95..047390a95 100644
--- a/data/maps/text/EverGrandeCity_PhoebesRoom.s
+++ b/data/text/maps/EverGrandeCity_PhoebesRoom.s
diff --git a/data/maps/text/EverGrandeCity_PokemonCenter_1F.s b/data/text/maps/EverGrandeCity_PokemonCenter_1F.s
index 767e24696..767e24696 100644
--- a/data/maps/text/EverGrandeCity_PokemonCenter_1F.s
+++ b/data/text/maps/EverGrandeCity_PokemonCenter_1F.s
diff --git a/data/maps/text/EverGrandeCity_PokemonLeague.s b/data/text/maps/EverGrandeCity_PokemonLeague.s
index 3d5c5fa1f..3d5c5fa1f 100644
--- a/data/maps/text/EverGrandeCity_PokemonLeague.s
+++ b/data/text/maps/EverGrandeCity_PokemonLeague.s
diff --git a/data/maps/text/EverGrandeCity_SidneysRoom.s b/data/text/maps/EverGrandeCity_SidneysRoom.s
index 6ec9f3327..6ec9f3327 100644
--- a/data/maps/text/EverGrandeCity_SidneysRoom.s
+++ b/data/text/maps/EverGrandeCity_SidneysRoom.s
diff --git a/data/maps/text/FallarborTown.s b/data/text/maps/FallarborTown.s
index 6bb2b38e0..6bb2b38e0 100644
--- a/data/maps/text/FallarborTown.s
+++ b/data/text/maps/FallarborTown.s
diff --git a/data/maps/text/FallarborTown_ContestHall.s b/data/text/maps/FallarborTown_ContestHall.s
index a9ff40989..a9ff40989 100644
--- a/data/maps/text/FallarborTown_ContestHall.s
+++ b/data/text/maps/FallarborTown_ContestHall.s
diff --git a/data/maps/text/FallarborTown_ContestLobby.s b/data/text/maps/FallarborTown_ContestLobby.s
index 58a1116d1..58a1116d1 100644
--- a/data/maps/text/FallarborTown_ContestLobby.s
+++ b/data/text/maps/FallarborTown_ContestLobby.s
diff --git a/data/maps/text/FallarborTown_House1.s b/data/text/maps/FallarborTown_House1.s
index d01357fa2..d01357fa2 100644
--- a/data/maps/text/FallarborTown_House1.s
+++ b/data/text/maps/FallarborTown_House1.s
diff --git a/data/maps/text/FallarborTown_House2.s b/data/text/maps/FallarborTown_House2.s
index 32f430dd9..32f430dd9 100644
--- a/data/maps/text/FallarborTown_House2.s
+++ b/data/text/maps/FallarborTown_House2.s
diff --git a/data/maps/text/FallarborTown_Mart.s b/data/text/maps/FallarborTown_Mart.s
index a83d94a9f..a83d94a9f 100644
--- a/data/maps/text/FallarborTown_Mart.s
+++ b/data/text/maps/FallarborTown_Mart.s
diff --git a/data/maps/text/FallarborTown_PokemonCenter_1F.s b/data/text/maps/FallarborTown_PokemonCenter_1F.s
index 8c3f8886e..8c3f8886e 100644
--- a/data/maps/text/FallarborTown_PokemonCenter_1F.s
+++ b/data/text/maps/FallarborTown_PokemonCenter_1F.s
diff --git a/data/maps/text/FortreeCity.s b/data/text/maps/FortreeCity.s
index 873c61066..873c61066 100644
--- a/data/maps/text/FortreeCity.s
+++ b/data/text/maps/FortreeCity.s
diff --git a/data/maps/text/FortreeCity_DecorationShop.s b/data/text/maps/FortreeCity_DecorationShop.s
index d977d0e35..d977d0e35 100644
--- a/data/maps/text/FortreeCity_DecorationShop.s
+++ b/data/text/maps/FortreeCity_DecorationShop.s
diff --git a/data/maps/text/FortreeCity_Gym.s b/data/text/maps/FortreeCity_Gym.s
index 1c8d5c55d..1c8d5c55d 100644
--- a/data/maps/text/FortreeCity_Gym.s
+++ b/data/text/maps/FortreeCity_Gym.s
diff --git a/data/maps/text/FortreeCity_House1.s b/data/text/maps/FortreeCity_House1.s
index 605d9a842..605d9a842 100644
--- a/data/maps/text/FortreeCity_House1.s
+++ b/data/text/maps/FortreeCity_House1.s
diff --git a/data/maps/text/FortreeCity_House2.s b/data/text/maps/FortreeCity_House2.s
index 60ee2442f..60ee2442f 100644
--- a/data/maps/text/FortreeCity_House2.s
+++ b/data/text/maps/FortreeCity_House2.s
diff --git a/data/maps/text/FortreeCity_House3.s b/data/text/maps/FortreeCity_House3.s
index a4705366d..a4705366d 100644
--- a/data/maps/text/FortreeCity_House3.s
+++ b/data/text/maps/FortreeCity_House3.s
diff --git a/data/maps/text/FortreeCity_House4.s b/data/text/maps/FortreeCity_House4.s
index 7673409b8..7673409b8 100644
--- a/data/maps/text/FortreeCity_House4.s
+++ b/data/text/maps/FortreeCity_House4.s
diff --git a/data/maps/text/FortreeCity_House5.s b/data/text/maps/FortreeCity_House5.s
index 4d35b3a7b..4d35b3a7b 100644
--- a/data/maps/text/FortreeCity_House5.s
+++ b/data/text/maps/FortreeCity_House5.s
diff --git a/data/maps/text/FortreeCity_Mart.s b/data/text/maps/FortreeCity_Mart.s
index 9f12492a1..9f12492a1 100644
--- a/data/maps/text/FortreeCity_Mart.s
+++ b/data/text/maps/FortreeCity_Mart.s
diff --git a/data/maps/text/FortreeCity_PokemonCenter_1F.s b/data/text/maps/FortreeCity_PokemonCenter_1F.s
index 7ce6d3c3f..7ce6d3c3f 100644
--- a/data/maps/text/FortreeCity_PokemonCenter_1F.s
+++ b/data/text/maps/FortreeCity_PokemonCenter_1F.s
diff --git a/data/maps/text/GraniteCave_1F.s b/data/text/maps/GraniteCave_1F.s
index a2f1257fb..a2f1257fb 100644
--- a/data/maps/text/GraniteCave_1F.s
+++ b/data/text/maps/GraniteCave_1F.s
diff --git a/data/maps/text/GraniteCave_StevensRoom.s b/data/text/maps/GraniteCave_StevensRoom.s
index 78e74a984..78e74a984 100644
--- a/data/maps/text/GraniteCave_StevensRoom.s
+++ b/data/text/maps/GraniteCave_StevensRoom.s
diff --git a/data/maps/text/InsideOfTruck.s b/data/text/maps/InsideOfTruck.s
index e4d4ada90..e4d4ada90 100644
--- a/data/maps/text/InsideOfTruck.s
+++ b/data/text/maps/InsideOfTruck.s
diff --git a/data/maps/text/IslandCave.s b/data/text/maps/IslandCave.s
index 5722700dd..5722700dd 100644
--- a/data/maps/text/IslandCave.s
+++ b/data/text/maps/IslandCave.s
diff --git a/data/maps/text/JaggedPass.s b/data/text/maps/JaggedPass.s
index 9c9798959..9c9798959 100644
--- a/data/maps/text/JaggedPass.s
+++ b/data/text/maps/JaggedPass.s
diff --git a/data/maps/text/LavaridgeTown.s b/data/text/maps/LavaridgeTown.s
index dbd5fde24..dbd5fde24 100644
--- a/data/maps/text/LavaridgeTown.s
+++ b/data/text/maps/LavaridgeTown.s
diff --git a/data/maps/text/LavaridgeTown_Gym_1F.s b/data/text/maps/LavaridgeTown_Gym_1F.s
index 1a59a31da..1a59a31da 100644
--- a/data/maps/text/LavaridgeTown_Gym_1F.s
+++ b/data/text/maps/LavaridgeTown_Gym_1F.s
diff --git a/data/maps/text/LavaridgeTown_HerbShop.s b/data/text/maps/LavaridgeTown_HerbShop.s
index e3f3dd526..e3f3dd526 100644
--- a/data/maps/text/LavaridgeTown_HerbShop.s
+++ b/data/text/maps/LavaridgeTown_HerbShop.s
diff --git a/data/maps/text/LavaridgeTown_House.s b/data/text/maps/LavaridgeTown_House.s
index 7bd77210a..7bd77210a 100644
--- a/data/maps/text/LavaridgeTown_House.s
+++ b/data/text/maps/LavaridgeTown_House.s
diff --git a/data/maps/text/LavaridgeTown_Mart.s b/data/text/maps/LavaridgeTown_Mart.s
index 1f04a0dd8..1f04a0dd8 100644
--- a/data/maps/text/LavaridgeTown_Mart.s
+++ b/data/text/maps/LavaridgeTown_Mart.s
diff --git a/data/maps/text/LavaridgeTown_PokemonCenter_1F.s b/data/text/maps/LavaridgeTown_PokemonCenter_1F.s
index 6585b5219..6585b5219 100644
--- a/data/maps/text/LavaridgeTown_PokemonCenter_1F.s
+++ b/data/text/maps/LavaridgeTown_PokemonCenter_1F.s
diff --git a/data/maps/text/LilycoveCity.s b/data/text/maps/LilycoveCity.s
index 8ff35d572..8ff35d572 100644
--- a/data/maps/text/LilycoveCity.s
+++ b/data/text/maps/LilycoveCity.s
diff --git a/data/maps/text/LilycoveCity_ContestHall.s b/data/text/maps/LilycoveCity_ContestHall.s
index 99131eb71..99131eb71 100644
--- a/data/maps/text/LilycoveCity_ContestHall.s
+++ b/data/text/maps/LilycoveCity_ContestHall.s
diff --git a/data/maps/text/LilycoveCity_ContestLobby.s b/data/text/maps/LilycoveCity_ContestLobby.s
index d173519e8..d173519e8 100644
--- a/data/maps/text/LilycoveCity_ContestLobby.s
+++ b/data/text/maps/LilycoveCity_ContestLobby.s
diff --git a/data/maps/text/LilycoveCity_CoveLilyMotel_1F.s b/data/text/maps/LilycoveCity_CoveLilyMotel_1F.s
index 0ecfd290b..0ecfd290b 100644
--- a/data/maps/text/LilycoveCity_CoveLilyMotel_1F.s
+++ b/data/text/maps/LilycoveCity_CoveLilyMotel_1F.s
diff --git a/data/maps/text/LilycoveCity_CoveLilyMotel_2F.s b/data/text/maps/LilycoveCity_CoveLilyMotel_2F.s
index 4aac25329..4aac25329 100644
--- a/data/maps/text/LilycoveCity_CoveLilyMotel_2F.s
+++ b/data/text/maps/LilycoveCity_CoveLilyMotel_2F.s
diff --git a/data/maps/text/LilycoveCity_DepartmentStoreElevator.s b/data/text/maps/LilycoveCity_DepartmentStoreElevator.s
index 8c7826d44..8c7826d44 100644
--- a/data/maps/text/LilycoveCity_DepartmentStoreElevator.s
+++ b/data/text/maps/LilycoveCity_DepartmentStoreElevator.s
diff --git a/data/maps/text/LilycoveCity_DepartmentStoreRooftop.s b/data/text/maps/LilycoveCity_DepartmentStoreRooftop.s
index cc788cb16..cc788cb16 100644
--- a/data/maps/text/LilycoveCity_DepartmentStoreRooftop.s
+++ b/data/text/maps/LilycoveCity_DepartmentStoreRooftop.s
diff --git a/data/maps/text/LilycoveCity_DepartmentStore_1F.s b/data/text/maps/LilycoveCity_DepartmentStore_1F.s
index b4f34f2c3..b4f34f2c3 100644
--- a/data/maps/text/LilycoveCity_DepartmentStore_1F.s
+++ b/data/text/maps/LilycoveCity_DepartmentStore_1F.s
diff --git a/data/maps/text/LilycoveCity_DepartmentStore_2F.s b/data/text/maps/LilycoveCity_DepartmentStore_2F.s
index 3b4271ca7..3b4271ca7 100644
--- a/data/maps/text/LilycoveCity_DepartmentStore_2F.s
+++ b/data/text/maps/LilycoveCity_DepartmentStore_2F.s
diff --git a/data/maps/text/LilycoveCity_DepartmentStore_3F.s b/data/text/maps/LilycoveCity_DepartmentStore_3F.s
index baecfcecf..baecfcecf 100644
--- a/data/maps/text/LilycoveCity_DepartmentStore_3F.s
+++ b/data/text/maps/LilycoveCity_DepartmentStore_3F.s
diff --git a/data/maps/text/LilycoveCity_DepartmentStore_4F.s b/data/text/maps/LilycoveCity_DepartmentStore_4F.s
index 7cfa099ea..7cfa099ea 100644
--- a/data/maps/text/LilycoveCity_DepartmentStore_4F.s
+++ b/data/text/maps/LilycoveCity_DepartmentStore_4F.s
diff --git a/data/maps/text/LilycoveCity_DepartmentStore_5F.s b/data/text/maps/LilycoveCity_DepartmentStore_5F.s
index c1e3975cb..c1e3975cb 100644
--- a/data/maps/text/LilycoveCity_DepartmentStore_5F.s
+++ b/data/text/maps/LilycoveCity_DepartmentStore_5F.s
diff --git a/data/maps/text/LilycoveCity_Harbor.s b/data/text/maps/LilycoveCity_Harbor.s
index 8b30a1ec0..8b30a1ec0 100644
--- a/data/maps/text/LilycoveCity_Harbor.s
+++ b/data/text/maps/LilycoveCity_Harbor.s
diff --git a/data/maps/text/LilycoveCity_House1.s b/data/text/maps/LilycoveCity_House1.s
index b70a063ee..b70a063ee 100644
--- a/data/maps/text/LilycoveCity_House1.s
+++ b/data/text/maps/LilycoveCity_House1.s
diff --git a/data/maps/text/LilycoveCity_House2.s b/data/text/maps/LilycoveCity_House2.s
index c50013bf8..c50013bf8 100644
--- a/data/maps/text/LilycoveCity_House2.s
+++ b/data/text/maps/LilycoveCity_House2.s
diff --git a/data/maps/text/LilycoveCity_House3.s b/data/text/maps/LilycoveCity_House3.s
index bb20e610f..bb20e610f 100644
--- a/data/maps/text/LilycoveCity_House3.s
+++ b/data/text/maps/LilycoveCity_House3.s
diff --git a/data/maps/text/LilycoveCity_House4.s b/data/text/maps/LilycoveCity_House4.s
index 62b00b418..62b00b418 100644
--- a/data/maps/text/LilycoveCity_House4.s
+++ b/data/text/maps/LilycoveCity_House4.s
diff --git a/data/maps/text/LilycoveCity_LilycoveMuseum_1F.s b/data/text/maps/LilycoveCity_LilycoveMuseum_1F.s
index c8770999f..c8770999f 100644
--- a/data/maps/text/LilycoveCity_LilycoveMuseum_1F.s
+++ b/data/text/maps/LilycoveCity_LilycoveMuseum_1F.s
diff --git a/data/maps/text/LilycoveCity_LilycoveMuseum_2F.s b/data/text/maps/LilycoveCity_LilycoveMuseum_2F.s
index 65d4f6700..65d4f6700 100644
--- a/data/maps/text/LilycoveCity_LilycoveMuseum_2F.s
+++ b/data/text/maps/LilycoveCity_LilycoveMuseum_2F.s
diff --git a/data/maps/text/LilycoveCity_MoveDeletersHouse.s b/data/text/maps/LilycoveCity_MoveDeletersHouse.s
index 532aa6cc4..532aa6cc4 100644
--- a/data/maps/text/LilycoveCity_MoveDeletersHouse.s
+++ b/data/text/maps/LilycoveCity_MoveDeletersHouse.s
diff --git a/data/maps/text/LilycoveCity_PokemonCenter_1F.s b/data/text/maps/LilycoveCity_PokemonCenter_1F.s
index b9a43f2e1..b9a43f2e1 100644
--- a/data/maps/text/LilycoveCity_PokemonCenter_1F.s
+++ b/data/text/maps/LilycoveCity_PokemonCenter_1F.s
diff --git a/data/maps/text/LilycoveCity_PokemonTrainerFanClub.s b/data/text/maps/LilycoveCity_PokemonTrainerFanClub.s
index c40892c52..c40892c52 100644
--- a/data/maps/text/LilycoveCity_PokemonTrainerFanClub.s
+++ b/data/text/maps/LilycoveCity_PokemonTrainerFanClub.s
diff --git a/data/maps/text/LinkContestRoom1.s b/data/text/maps/LinkContestRoom1.s
index a3f3c2a53..a3f3c2a53 100644
--- a/data/maps/text/LinkContestRoom1.s
+++ b/data/text/maps/LinkContestRoom1.s
diff --git a/data/maps/text/LittlerootTown.s b/data/text/maps/LittlerootTown.s
index 7ae7cf9af..7ae7cf9af 100644
--- a/data/maps/text/LittlerootTown.s
+++ b/data/text/maps/LittlerootTown.s
diff --git a/data/maps/text/LittlerootTown_BrendansHouse_1F.s b/data/text/maps/LittlerootTown_BrendansHouse_1F.s
index 888fc8973..888fc8973 100644
--- a/data/maps/text/LittlerootTown_BrendansHouse_1F.s
+++ b/data/text/maps/LittlerootTown_BrendansHouse_1F.s
diff --git a/data/maps/text/LittlerootTown_BrendansHouse_2F.s b/data/text/maps/LittlerootTown_BrendansHouse_2F.s
index e12500ca9..e12500ca9 100644
--- a/data/maps/text/LittlerootTown_BrendansHouse_2F.s
+++ b/data/text/maps/LittlerootTown_BrendansHouse_2F.s
diff --git a/data/maps/text/LittlerootTown_MaysHouse_1F.s b/data/text/maps/LittlerootTown_MaysHouse_1F.s
index aef905854..aef905854 100644
--- a/data/maps/text/LittlerootTown_MaysHouse_1F.s
+++ b/data/text/maps/LittlerootTown_MaysHouse_1F.s
diff --git a/data/maps/text/LittlerootTown_MaysHouse_2F.s b/data/text/maps/LittlerootTown_MaysHouse_2F.s
index a63675bce..a63675bce 100644
--- a/data/maps/text/LittlerootTown_MaysHouse_2F.s
+++ b/data/text/maps/LittlerootTown_MaysHouse_2F.s
diff --git a/data/maps/text/LittlerootTown_ProfessorBirchsLab.s b/data/text/maps/LittlerootTown_ProfessorBirchsLab.s
index 28dd5b31f..28dd5b31f 100644
--- a/data/maps/text/LittlerootTown_ProfessorBirchsLab.s
+++ b/data/text/maps/LittlerootTown_ProfessorBirchsLab.s
diff --git a/data/maps/text/MauvilleCity.s b/data/text/maps/MauvilleCity.s
index f72dd5be1..f72dd5be1 100644
--- a/data/maps/text/MauvilleCity.s
+++ b/data/text/maps/MauvilleCity.s
diff --git a/data/maps/text/MauvilleCity_BikeShop.s b/data/text/maps/MauvilleCity_BikeShop.s
index 3bdb594b9..3bdb594b9 100644
--- a/data/maps/text/MauvilleCity_BikeShop.s
+++ b/data/text/maps/MauvilleCity_BikeShop.s
diff --git a/data/maps/text/MauvilleCity_GameCorner.s b/data/text/maps/MauvilleCity_GameCorner.s
index 00eb1368c..00eb1368c 100644
--- a/data/maps/text/MauvilleCity_GameCorner.s
+++ b/data/text/maps/MauvilleCity_GameCorner.s
diff --git a/data/maps/text/MauvilleCity_Gym.s b/data/text/maps/MauvilleCity_Gym.s
index c143e2281..c143e2281 100644
--- a/data/maps/text/MauvilleCity_Gym.s
+++ b/data/text/maps/MauvilleCity_Gym.s
diff --git a/data/maps/text/MauvilleCity_House1.s b/data/text/maps/MauvilleCity_House1.s
index 60f44c47d..60f44c47d 100644
--- a/data/maps/text/MauvilleCity_House1.s
+++ b/data/text/maps/MauvilleCity_House1.s
diff --git a/data/maps/text/MauvilleCity_House2.s b/data/text/maps/MauvilleCity_House2.s
index 8d2053b33..8d2053b33 100644
--- a/data/maps/text/MauvilleCity_House2.s
+++ b/data/text/maps/MauvilleCity_House2.s
diff --git a/data/maps/text/MauvilleCity_Mart.s b/data/text/maps/MauvilleCity_Mart.s
index 63d02b551..63d02b551 100644
--- a/data/maps/text/MauvilleCity_Mart.s
+++ b/data/text/maps/MauvilleCity_Mart.s
diff --git a/data/maps/text/MauvilleCity_PokemonCenter_1F.s b/data/text/maps/MauvilleCity_PokemonCenter_1F.s
index 797dc87d5..797dc87d5 100644
--- a/data/maps/text/MauvilleCity_PokemonCenter_1F.s
+++ b/data/text/maps/MauvilleCity_PokemonCenter_1F.s
diff --git a/data/maps/text/MauvilleCity_PokemonCenter_2F.s b/data/text/maps/MauvilleCity_PokemonCenter_2F.s
index 68296bb2d..68296bb2d 100644
--- a/data/maps/text/MauvilleCity_PokemonCenter_2F.s
+++ b/data/text/maps/MauvilleCity_PokemonCenter_2F.s
diff --git a/data/maps/text/MeteorFalls_1F_1R.s b/data/text/maps/MeteorFalls_1F_1R.s
index 788d692c4..788d692c4 100644
--- a/data/maps/text/MeteorFalls_1F_1R.s
+++ b/data/text/maps/MeteorFalls_1F_1R.s
diff --git a/data/maps/text/MeteorFalls_1F_2R.s b/data/text/maps/MeteorFalls_1F_2R.s
index a260ce9ef..a260ce9ef 100644
--- a/data/maps/text/MeteorFalls_1F_2R.s
+++ b/data/text/maps/MeteorFalls_1F_2R.s
diff --git a/data/maps/text/MossdeepCity.s b/data/text/maps/MossdeepCity.s
index 9bdcf3b3c..9bdcf3b3c 100644
--- a/data/maps/text/MossdeepCity.s
+++ b/data/text/maps/MossdeepCity.s
diff --git a/data/maps/text/MossdeepCity_GameCorner_1F.s b/data/text/maps/MossdeepCity_GameCorner_1F.s
index 7324999c8..7324999c8 100644
--- a/data/maps/text/MossdeepCity_GameCorner_1F.s
+++ b/data/text/maps/MossdeepCity_GameCorner_1F.s
diff --git a/data/maps/text/MossdeepCity_GameCorner_B1F.s b/data/text/maps/MossdeepCity_GameCorner_B1F.s
index 8b1378917..8b1378917 100644
--- a/data/maps/text/MossdeepCity_GameCorner_B1F.s
+++ b/data/text/maps/MossdeepCity_GameCorner_B1F.s
diff --git a/data/maps/text/MossdeepCity_Gym.s b/data/text/maps/MossdeepCity_Gym.s
index 4bb63b01a..4bb63b01a 100644
--- a/data/maps/text/MossdeepCity_Gym.s
+++ b/data/text/maps/MossdeepCity_Gym.s
diff --git a/data/maps/text/MossdeepCity_House1.s b/data/text/maps/MossdeepCity_House1.s
index 81a6194bd..81a6194bd 100644
--- a/data/maps/text/MossdeepCity_House1.s
+++ b/data/text/maps/MossdeepCity_House1.s
diff --git a/data/maps/text/MossdeepCity_House2.s b/data/text/maps/MossdeepCity_House2.s
index 74bf1fa22..74bf1fa22 100644
--- a/data/maps/text/MossdeepCity_House2.s
+++ b/data/text/maps/MossdeepCity_House2.s
diff --git a/data/maps/text/MossdeepCity_House3.s b/data/text/maps/MossdeepCity_House3.s
index e4b8779ce..e4b8779ce 100644
--- a/data/maps/text/MossdeepCity_House3.s
+++ b/data/text/maps/MossdeepCity_House3.s
diff --git a/data/maps/text/MossdeepCity_House4.s b/data/text/maps/MossdeepCity_House4.s
index ab9106da6..ab9106da6 100644
--- a/data/maps/text/MossdeepCity_House4.s
+++ b/data/text/maps/MossdeepCity_House4.s
diff --git a/data/maps/text/MossdeepCity_Mart.s b/data/text/maps/MossdeepCity_Mart.s
index fec3149ce..fec3149ce 100644
--- a/data/maps/text/MossdeepCity_Mart.s
+++ b/data/text/maps/MossdeepCity_Mart.s
diff --git a/data/maps/text/MossdeepCity_PokemonCenter_1F.s b/data/text/maps/MossdeepCity_PokemonCenter_1F.s
index d9f42b3a1..d9f42b3a1 100644
--- a/data/maps/text/MossdeepCity_PokemonCenter_1F.s
+++ b/data/text/maps/MossdeepCity_PokemonCenter_1F.s
diff --git a/data/maps/text/MossdeepCity_PokemonCenter_2F.s b/data/text/maps/MossdeepCity_PokemonCenter_2F.s
index 486d36d76..486d36d76 100644
--- a/data/maps/text/MossdeepCity_PokemonCenter_2F.s
+++ b/data/text/maps/MossdeepCity_PokemonCenter_2F.s
diff --git a/data/maps/text/MossdeepCity_SpaceCenter_1F.s b/data/text/maps/MossdeepCity_SpaceCenter_1F.s
index 23f544099..23f544099 100644
--- a/data/maps/text/MossdeepCity_SpaceCenter_1F.s
+++ b/data/text/maps/MossdeepCity_SpaceCenter_1F.s
diff --git a/data/maps/text/MossdeepCity_SpaceCenter_2F.s b/data/text/maps/MossdeepCity_SpaceCenter_2F.s
index fdaf8d0a5..fdaf8d0a5 100644
--- a/data/maps/text/MossdeepCity_SpaceCenter_2F.s
+++ b/data/text/maps/MossdeepCity_SpaceCenter_2F.s
diff --git a/data/maps/text/MossdeepCity_StevensHouse.s b/data/text/maps/MossdeepCity_StevensHouse.s
index b05b557b8..b05b557b8 100644
--- a/data/maps/text/MossdeepCity_StevensHouse.s
+++ b/data/text/maps/MossdeepCity_StevensHouse.s
diff --git a/data/maps/text/MtChimney.s b/data/text/maps/MtChimney.s
index 3c033fe0c..3c033fe0c 100644
--- a/data/maps/text/MtChimney.s
+++ b/data/text/maps/MtChimney.s
diff --git a/data/maps/text/MtChimney_CableCarStation.s b/data/text/maps/MtChimney_CableCarStation.s
index 03e2f7a2a..03e2f7a2a 100644
--- a/data/maps/text/MtChimney_CableCarStation.s
+++ b/data/text/maps/MtChimney_CableCarStation.s
diff --git a/data/maps/text/MtPyre_1F.s b/data/text/maps/MtPyre_1F.s
index ff17f173e..ff17f173e 100644
--- a/data/maps/text/MtPyre_1F.s
+++ b/data/text/maps/MtPyre_1F.s
diff --git a/data/maps/text/MtPyre_2F.s b/data/text/maps/MtPyre_2F.s
index f98b916d5..f98b916d5 100644
--- a/data/maps/text/MtPyre_2F.s
+++ b/data/text/maps/MtPyre_2F.s
diff --git a/data/maps/text/MtPyre_3F.s b/data/text/maps/MtPyre_3F.s
index 3eb54cc99..3eb54cc99 100644
--- a/data/maps/text/MtPyre_3F.s
+++ b/data/text/maps/MtPyre_3F.s
diff --git a/data/maps/text/MtPyre_4F.s b/data/text/maps/MtPyre_4F.s
index e1f539cdc..e1f539cdc 100644
--- a/data/maps/text/MtPyre_4F.s
+++ b/data/text/maps/MtPyre_4F.s
diff --git a/data/maps/text/MtPyre_5F.s b/data/text/maps/MtPyre_5F.s
index 9830042f9..9830042f9 100644
--- a/data/maps/text/MtPyre_5F.s
+++ b/data/text/maps/MtPyre_5F.s
diff --git a/data/maps/text/MtPyre_6F.s b/data/text/maps/MtPyre_6F.s
index de30577bc..de30577bc 100644
--- a/data/maps/text/MtPyre_6F.s
+++ b/data/text/maps/MtPyre_6F.s
diff --git a/data/maps/text/MtPyre_Summit.s b/data/text/maps/MtPyre_Summit.s
index 1c2e6be8a..1c2e6be8a 100644
--- a/data/maps/text/MtPyre_Summit.s
+++ b/data/text/maps/MtPyre_Summit.s
diff --git a/data/maps/text/NewMauville_Entrance.s b/data/text/maps/NewMauville_Entrance.s
index 070e9cdec..070e9cdec 100644
--- a/data/maps/text/NewMauville_Entrance.s
+++ b/data/text/maps/NewMauville_Entrance.s
diff --git a/data/maps/text/NewMauville_Inside.s b/data/text/maps/NewMauville_Inside.s
index 982e1a004..982e1a004 100644
--- a/data/maps/text/NewMauville_Inside.s
+++ b/data/text/maps/NewMauville_Inside.s
diff --git a/data/maps/text/OldaleTown.s b/data/text/maps/OldaleTown.s
index 349d9b480..349d9b480 100644
--- a/data/maps/text/OldaleTown.s
+++ b/data/text/maps/OldaleTown.s
diff --git a/data/maps/text/OldaleTown_House1.s b/data/text/maps/OldaleTown_House1.s
index f153339eb..f153339eb 100644
--- a/data/maps/text/OldaleTown_House1.s
+++ b/data/text/maps/OldaleTown_House1.s
diff --git a/data/maps/text/OldaleTown_House2.s b/data/text/maps/OldaleTown_House2.s
index a4cb72254..a4cb72254 100644
--- a/data/maps/text/OldaleTown_House2.s
+++ b/data/text/maps/OldaleTown_House2.s
diff --git a/data/maps/text/OldaleTown_Mart.s b/data/text/maps/OldaleTown_Mart.s
index 71e0a0513..71e0a0513 100644
--- a/data/maps/text/OldaleTown_Mart.s
+++ b/data/text/maps/OldaleTown_Mart.s
diff --git a/data/maps/text/OldaleTown_PokemonCenter_1F.s b/data/text/maps/OldaleTown_PokemonCenter_1F.s
index 5b3f1f674..5b3f1f674 100644
--- a/data/maps/text/OldaleTown_PokemonCenter_1F.s
+++ b/data/text/maps/OldaleTown_PokemonCenter_1F.s
diff --git a/data/maps/text/OldaleTown_PokemonCenter_2F.s b/data/text/maps/OldaleTown_PokemonCenter_2F.s
index 78a02ffbe..78a02ffbe 100644
--- a/data/maps/text/OldaleTown_PokemonCenter_2F.s
+++ b/data/text/maps/OldaleTown_PokemonCenter_2F.s
diff --git a/data/maps/text/PacifidlogTown.s b/data/text/maps/PacifidlogTown.s
index 9f67efa9e..9f67efa9e 100644
--- a/data/maps/text/PacifidlogTown.s
+++ b/data/text/maps/PacifidlogTown.s
diff --git a/data/maps/text/PacifidlogTown_House1.s b/data/text/maps/PacifidlogTown_House1.s
index 7c3e3afd4..7c3e3afd4 100644
--- a/data/maps/text/PacifidlogTown_House1.s
+++ b/data/text/maps/PacifidlogTown_House1.s
diff --git a/data/maps/text/PacifidlogTown_House2.s b/data/text/maps/PacifidlogTown_House2.s
index 0e56cea1c..0e56cea1c 100644
--- a/data/maps/text/PacifidlogTown_House2.s
+++ b/data/text/maps/PacifidlogTown_House2.s
diff --git a/data/maps/text/PacifidlogTown_House3.s b/data/text/maps/PacifidlogTown_House3.s
index 0dba3cca4..0dba3cca4 100644
--- a/data/maps/text/PacifidlogTown_House3.s
+++ b/data/text/maps/PacifidlogTown_House3.s
diff --git a/data/maps/text/PacifidlogTown_House4.s b/data/text/maps/PacifidlogTown_House4.s
index a5cb340f8..a5cb340f8 100644
--- a/data/maps/text/PacifidlogTown_House4.s
+++ b/data/text/maps/PacifidlogTown_House4.s
diff --git a/data/maps/text/PacifidlogTown_House5.s b/data/text/maps/PacifidlogTown_House5.s
index ece3aca2e..ece3aca2e 100644
--- a/data/maps/text/PacifidlogTown_House5.s
+++ b/data/text/maps/PacifidlogTown_House5.s
diff --git a/data/maps/text/PacifidlogTown_PokemonCenter_1F.s b/data/text/maps/PacifidlogTown_PokemonCenter_1F.s
index 6ded1de17..6ded1de17 100644
--- a/data/maps/text/PacifidlogTown_PokemonCenter_1F.s
+++ b/data/text/maps/PacifidlogTown_PokemonCenter_1F.s
diff --git a/data/maps/text/PetalburgCity.s b/data/text/maps/PetalburgCity.s
index 62b4423dc..62b4423dc 100644
--- a/data/maps/text/PetalburgCity.s
+++ b/data/text/maps/PetalburgCity.s
diff --git a/data/maps/text/PetalburgCity_Gym.s b/data/text/maps/PetalburgCity_Gym.s
index 715229880..715229880 100644
--- a/data/maps/text/PetalburgCity_Gym.s
+++ b/data/text/maps/PetalburgCity_Gym.s
diff --git a/data/maps/text/PetalburgCity_House1.s b/data/text/maps/PetalburgCity_House1.s
index c1cb09305..c1cb09305 100644
--- a/data/maps/text/PetalburgCity_House1.s
+++ b/data/text/maps/PetalburgCity_House1.s
diff --git a/data/maps/text/PetalburgCity_House2.s b/data/text/maps/PetalburgCity_House2.s
index b0eec582c..b0eec582c 100644
--- a/data/maps/text/PetalburgCity_House2.s
+++ b/data/text/maps/PetalburgCity_House2.s
diff --git a/data/maps/text/PetalburgCity_Mart.s b/data/text/maps/PetalburgCity_Mart.s
index 42dd9f329..42dd9f329 100644
--- a/data/maps/text/PetalburgCity_Mart.s
+++ b/data/text/maps/PetalburgCity_Mart.s
diff --git a/data/maps/text/PetalburgCity_PokemonCenter_1F.s b/data/text/maps/PetalburgCity_PokemonCenter_1F.s
index 63a203107..63a203107 100644
--- a/data/maps/text/PetalburgCity_PokemonCenter_1F.s
+++ b/data/text/maps/PetalburgCity_PokemonCenter_1F.s
diff --git a/data/maps/text/PetalburgCity_WallysHouse.s b/data/text/maps/PetalburgCity_WallysHouse.s
index 7a4e50ec8..7a4e50ec8 100644
--- a/data/maps/text/PetalburgCity_WallysHouse.s
+++ b/data/text/maps/PetalburgCity_WallysHouse.s
diff --git a/data/maps/text/PetalburgWoods.s b/data/text/maps/PetalburgWoods.s
index 6305d32c2..6305d32c2 100644
--- a/data/maps/text/PetalburgWoods.s
+++ b/data/text/maps/PetalburgWoods.s
diff --git a/data/maps/text/RecordCorner.s b/data/text/maps/RecordCorner.s
index 4ee9f975b..4ee9f975b 100644
--- a/data/maps/text/RecordCorner.s
+++ b/data/text/maps/RecordCorner.s
diff --git a/data/maps/text/Route101.s b/data/text/maps/Route101.s
index 1897cce4e..1897cce4e 100644
--- a/data/maps/text/Route101.s
+++ b/data/text/maps/Route101.s
diff --git a/data/maps/text/Route102.s b/data/text/maps/Route102.s
index cf367edc2..cf367edc2 100644
--- a/data/maps/text/Route102.s
+++ b/data/text/maps/Route102.s
diff --git a/data/maps/text/Route103.s b/data/text/maps/Route103.s
index 97ad26169..97ad26169 100644
--- a/data/maps/text/Route103.s
+++ b/data/text/maps/Route103.s
diff --git a/data/maps/text/Route104.s b/data/text/maps/Route104.s
index 95f70a7ec..95f70a7ec 100644
--- a/data/maps/text/Route104.s
+++ b/data/text/maps/Route104.s
diff --git a/data/maps/text/Route104_MrBrineysHouse.s b/data/text/maps/Route104_MrBrineysHouse.s
index f75c7a8a2..f75c7a8a2 100644
--- a/data/maps/text/Route104_MrBrineysHouse.s
+++ b/data/text/maps/Route104_MrBrineysHouse.s
diff --git a/data/maps/text/Route104_PrettyPetalFlowerShop.s b/data/text/maps/Route104_PrettyPetalFlowerShop.s
index 53a329108..53a329108 100644
--- a/data/maps/text/Route104_PrettyPetalFlowerShop.s
+++ b/data/text/maps/Route104_PrettyPetalFlowerShop.s
diff --git a/data/maps/text/Route104_Prototype.s b/data/text/maps/Route104_Prototype.s
index 59a71018f..59a71018f 100644
--- a/data/maps/text/Route104_Prototype.s
+++ b/data/text/maps/Route104_Prototype.s
diff --git a/data/maps/text/Route104_PrototypePrettyPetalFlowerShop.s b/data/text/maps/Route104_PrototypePrettyPetalFlowerShop.s
index 0c3af5f1f..0c3af5f1f 100644
--- a/data/maps/text/Route104_PrototypePrettyPetalFlowerShop.s
+++ b/data/text/maps/Route104_PrototypePrettyPetalFlowerShop.s
diff --git a/data/maps/text/Route105.s b/data/text/maps/Route105.s
index 8b1378917..8b1378917 100644
--- a/data/maps/text/Route105.s
+++ b/data/text/maps/Route105.s
diff --git a/data/maps/text/Route106.s b/data/text/maps/Route106.s
index 38e92c65d..38e92c65d 100644
--- a/data/maps/text/Route106.s
+++ b/data/text/maps/Route106.s
diff --git a/data/maps/text/Route107.s b/data/text/maps/Route107.s
index 8b1378917..8b1378917 100644
--- a/data/maps/text/Route107.s
+++ b/data/text/maps/Route107.s
diff --git a/data/maps/text/Route108.s b/data/text/maps/Route108.s
index 8b1378917..8b1378917 100644
--- a/data/maps/text/Route108.s
+++ b/data/text/maps/Route108.s
diff --git a/data/maps/text/Route109.s b/data/text/maps/Route109.s
index a86efa2c4..a86efa2c4 100644
--- a/data/maps/text/Route109.s
+++ b/data/text/maps/Route109.s
diff --git a/data/maps/text/Route109_SeashoreHouse.s b/data/text/maps/Route109_SeashoreHouse.s
index 59823f02c..59823f02c 100644
--- a/data/maps/text/Route109_SeashoreHouse.s
+++ b/data/text/maps/Route109_SeashoreHouse.s
diff --git a/data/maps/text/Route110.s b/data/text/maps/Route110.s
index 29fefe53e..29fefe53e 100644
--- a/data/maps/text/Route110.s
+++ b/data/text/maps/Route110.s
diff --git a/data/maps/text/Route110_SeasideCyclingRoadNorthEntrance.s b/data/text/maps/Route110_SeasideCyclingRoadNorthEntrance.s
index 8d5a0433e..8d5a0433e 100644
--- a/data/maps/text/Route110_SeasideCyclingRoadNorthEntrance.s
+++ b/data/text/maps/Route110_SeasideCyclingRoadNorthEntrance.s
diff --git a/data/maps/text/Route110_SeasideCyclingRoadSouthEntrance.s b/data/text/maps/Route110_SeasideCyclingRoadSouthEntrance.s
index 77bf90751..77bf90751 100644
--- a/data/maps/text/Route110_SeasideCyclingRoadSouthEntrance.s
+++ b/data/text/maps/Route110_SeasideCyclingRoadSouthEntrance.s
diff --git a/data/maps/text/Route110_TrickHouseEnd.s b/data/text/maps/Route110_TrickHouseEnd.s
index 9d8086d26..9d8086d26 100644
--- a/data/maps/text/Route110_TrickHouseEnd.s
+++ b/data/text/maps/Route110_TrickHouseEnd.s
diff --git a/data/maps/text/Route110_TrickHouseEntrance.s b/data/text/maps/Route110_TrickHouseEntrance.s
index 83f11ea5f..83f11ea5f 100644
--- a/data/maps/text/Route110_TrickHouseEntrance.s
+++ b/data/text/maps/Route110_TrickHouseEntrance.s
diff --git a/data/maps/text/Route110_TrickHousePuzzle1.s b/data/text/maps/Route110_TrickHousePuzzle1.s
index 84208ead5..84208ead5 100644
--- a/data/maps/text/Route110_TrickHousePuzzle1.s
+++ b/data/text/maps/Route110_TrickHousePuzzle1.s
diff --git a/data/maps/text/Route110_TrickHousePuzzle2.s b/data/text/maps/Route110_TrickHousePuzzle2.s
index 3b923be21..3b923be21 100644
--- a/data/maps/text/Route110_TrickHousePuzzle2.s
+++ b/data/text/maps/Route110_TrickHousePuzzle2.s
diff --git a/data/maps/text/Route110_TrickHousePuzzle3.s b/data/text/maps/Route110_TrickHousePuzzle3.s
index 9daf76b7d..9daf76b7d 100644
--- a/data/maps/text/Route110_TrickHousePuzzle3.s
+++ b/data/text/maps/Route110_TrickHousePuzzle3.s
diff --git a/data/maps/text/Route110_TrickHousePuzzle4.s b/data/text/maps/Route110_TrickHousePuzzle4.s
index ffb2cef06..ffb2cef06 100644
--- a/data/maps/text/Route110_TrickHousePuzzle4.s
+++ b/data/text/maps/Route110_TrickHousePuzzle4.s
diff --git a/data/maps/text/Route110_TrickHousePuzzle5.s b/data/text/maps/Route110_TrickHousePuzzle5.s
index 586349a6a..586349a6a 100644
--- a/data/maps/text/Route110_TrickHousePuzzle5.s
+++ b/data/text/maps/Route110_TrickHousePuzzle5.s
diff --git a/data/maps/text/Route110_TrickHousePuzzle6.s b/data/text/maps/Route110_TrickHousePuzzle6.s
index 4261a2797..4261a2797 100644
--- a/data/maps/text/Route110_TrickHousePuzzle6.s
+++ b/data/text/maps/Route110_TrickHousePuzzle6.s
diff --git a/data/maps/text/Route110_TrickHousePuzzle7.s b/data/text/maps/Route110_TrickHousePuzzle7.s
index 7dcfd169c..7dcfd169c 100644
--- a/data/maps/text/Route110_TrickHousePuzzle7.s
+++ b/data/text/maps/Route110_TrickHousePuzzle7.s
diff --git a/data/maps/text/Route110_TrickHousePuzzle8.s b/data/text/maps/Route110_TrickHousePuzzle8.s
index fa5173969..fa5173969 100644
--- a/data/maps/text/Route110_TrickHousePuzzle8.s
+++ b/data/text/maps/Route110_TrickHousePuzzle8.s
diff --git a/data/maps/text/Route111.s b/data/text/maps/Route111.s
index 35ed597cb..35ed597cb 100644
--- a/data/maps/text/Route111.s
+++ b/data/text/maps/Route111.s
diff --git a/data/maps/text/Route111_OldLadysRestStop.s b/data/text/maps/Route111_OldLadysRestStop.s
index 05823893d..05823893d 100644
--- a/data/maps/text/Route111_OldLadysRestStop.s
+++ b/data/text/maps/Route111_OldLadysRestStop.s
diff --git a/data/maps/text/Route111_WinstrateFamilysHouse.s b/data/text/maps/Route111_WinstrateFamilysHouse.s
index a2fb85041..a2fb85041 100644
--- a/data/maps/text/Route111_WinstrateFamilysHouse.s
+++ b/data/text/maps/Route111_WinstrateFamilysHouse.s
diff --git a/data/maps/text/Route112.s b/data/text/maps/Route112.s
index 5171aecaa..5171aecaa 100644
--- a/data/maps/text/Route112.s
+++ b/data/text/maps/Route112.s
diff --git a/data/maps/text/Route112_CableCarStation.s b/data/text/maps/Route112_CableCarStation.s
index f7167299c..f7167299c 100644
--- a/data/maps/text/Route112_CableCarStation.s
+++ b/data/text/maps/Route112_CableCarStation.s
diff --git a/data/maps/text/Route113.s b/data/text/maps/Route113.s
index 8ececd771..8ececd771 100644
--- a/data/maps/text/Route113.s
+++ b/data/text/maps/Route113.s
diff --git a/data/maps/text/Route113_GlassWorkshop.s b/data/text/maps/Route113_GlassWorkshop.s
index e80f72d0e..e80f72d0e 100644
--- a/data/maps/text/Route113_GlassWorkshop.s
+++ b/data/text/maps/Route113_GlassWorkshop.s
diff --git a/data/maps/text/Route114.s b/data/text/maps/Route114.s
index 5190cac0c..5190cac0c 100644
--- a/data/maps/text/Route114.s
+++ b/data/text/maps/Route114.s
diff --git a/data/maps/text/Route114_FossilManiacsHouse.s b/data/text/maps/Route114_FossilManiacsHouse.s
index af2cb7c6a..af2cb7c6a 100644
--- a/data/maps/text/Route114_FossilManiacsHouse.s
+++ b/data/text/maps/Route114_FossilManiacsHouse.s
diff --git a/data/maps/text/Route114_FossilManiacsTunnel.s b/data/text/maps/Route114_FossilManiacsTunnel.s
index 03b30ada6..03b30ada6 100644
--- a/data/maps/text/Route114_FossilManiacsTunnel.s
+++ b/data/text/maps/Route114_FossilManiacsTunnel.s
diff --git a/data/maps/text/Route114_LanettesHouse.s b/data/text/maps/Route114_LanettesHouse.s
index 35ec3e86b..35ec3e86b 100644
--- a/data/maps/text/Route114_LanettesHouse.s
+++ b/data/text/maps/Route114_LanettesHouse.s
diff --git a/data/maps/text/Route115.s b/data/text/maps/Route115.s
index 8e88c74dd..8e88c74dd 100644
--- a/data/maps/text/Route115.s
+++ b/data/text/maps/Route115.s
diff --git a/data/maps/text/Route116.s b/data/text/maps/Route116.s
index 9106aa1a4..9106aa1a4 100644
--- a/data/maps/text/Route116.s
+++ b/data/text/maps/Route116.s
diff --git a/data/maps/text/Route116_TunnelersRestHouse.s b/data/text/maps/Route116_TunnelersRestHouse.s
index ea6f0e97b..ea6f0e97b 100644
--- a/data/maps/text/Route116_TunnelersRestHouse.s
+++ b/data/text/maps/Route116_TunnelersRestHouse.s
diff --git a/data/maps/text/Route117.s b/data/text/maps/Route117.s
index 37482d51a..37482d51a 100644
--- a/data/maps/text/Route117.s
+++ b/data/text/maps/Route117.s
diff --git a/data/maps/text/Route117_PokemonDayCare.s b/data/text/maps/Route117_PokemonDayCare.s
index 5445200cc..5445200cc 100644
--- a/data/maps/text/Route117_PokemonDayCare.s
+++ b/data/text/maps/Route117_PokemonDayCare.s
diff --git a/data/maps/text/Route118.s b/data/text/maps/Route118.s
index f6636cada..f6636cada 100644
--- a/data/maps/text/Route118.s
+++ b/data/text/maps/Route118.s
diff --git a/data/maps/text/Route119.s b/data/text/maps/Route119.s
index 6df6f5e79..6df6f5e79 100644
--- a/data/maps/text/Route119.s
+++ b/data/text/maps/Route119.s
diff --git a/data/maps/text/Route119_House.s b/data/text/maps/Route119_House.s
index df5b32895..df5b32895 100644
--- a/data/maps/text/Route119_House.s
+++ b/data/text/maps/Route119_House.s
diff --git a/data/maps/text/Route119_WeatherInstitute_1F.s b/data/text/maps/Route119_WeatherInstitute_1F.s
index 30dc66a17..30dc66a17 100644
--- a/data/maps/text/Route119_WeatherInstitute_1F.s
+++ b/data/text/maps/Route119_WeatherInstitute_1F.s
diff --git a/data/maps/text/Route119_WeatherInstitute_2F.s b/data/text/maps/Route119_WeatherInstitute_2F.s
index 3b00452a7..3b00452a7 100644
--- a/data/maps/text/Route119_WeatherInstitute_2F.s
+++ b/data/text/maps/Route119_WeatherInstitute_2F.s
diff --git a/data/maps/text/Route120.s b/data/text/maps/Route120.s
index adaf369b1..adaf369b1 100644
--- a/data/maps/text/Route120.s
+++ b/data/text/maps/Route120.s
diff --git a/data/maps/text/Route121.s b/data/text/maps/Route121.s
index f62d91b5c..f62d91b5c 100644
--- a/data/maps/text/Route121.s
+++ b/data/text/maps/Route121.s
diff --git a/data/maps/text/Route121_SafariZoneEntrance.s b/data/text/maps/Route121_SafariZoneEntrance.s
index c3d6dd69b..c3d6dd69b 100644
--- a/data/maps/text/Route121_SafariZoneEntrance.s
+++ b/data/text/maps/Route121_SafariZoneEntrance.s
diff --git a/data/maps/text/Route123.s b/data/text/maps/Route123.s
index bebe88f83..bebe88f83 100644
--- a/data/maps/text/Route123.s
+++ b/data/text/maps/Route123.s
diff --git a/data/maps/text/Route123_BerryMastersHouse.s b/data/text/maps/Route123_BerryMastersHouse.s
index 8b1378917..8b1378917 100644
--- a/data/maps/text/Route123_BerryMastersHouse.s
+++ b/data/text/maps/Route123_BerryMastersHouse.s
diff --git a/data/maps/text/Route124.s b/data/text/maps/Route124.s
index 26b76cc2a..26b76cc2a 100644
--- a/data/maps/text/Route124.s
+++ b/data/text/maps/Route124.s
diff --git a/data/maps/text/Route124_DivingTreasureHuntersHouse.s b/data/text/maps/Route124_DivingTreasureHuntersHouse.s
index 84ce7168b..84ce7168b 100644
--- a/data/maps/text/Route124_DivingTreasureHuntersHouse.s
+++ b/data/text/maps/Route124_DivingTreasureHuntersHouse.s
diff --git a/data/maps/text/Route125.s b/data/text/maps/Route125.s
index e69de29bb..e69de29bb 100644
--- a/data/maps/text/Route125.s
+++ b/data/text/maps/Route125.s
diff --git a/data/maps/text/Route126.s b/data/text/maps/Route126.s
index e69de29bb..e69de29bb 100644
--- a/data/maps/text/Route126.s
+++ b/data/text/maps/Route126.s
diff --git a/data/maps/text/Route127.s b/data/text/maps/Route127.s
index e69de29bb..e69de29bb 100644
--- a/data/maps/text/Route127.s
+++ b/data/text/maps/Route127.s
diff --git a/data/maps/text/Route128.s b/data/text/maps/Route128.s
index e2410358b..e2410358b 100644
--- a/data/maps/text/Route128.s
+++ b/data/text/maps/Route128.s
diff --git a/data/maps/text/Route129.s b/data/text/maps/Route129.s
index e69de29bb..e69de29bb 100644
--- a/data/maps/text/Route129.s
+++ b/data/text/maps/Route129.s
diff --git a/data/maps/text/Route130.s b/data/text/maps/Route130.s
index e69de29bb..e69de29bb 100644
--- a/data/maps/text/Route130.s
+++ b/data/text/maps/Route130.s
diff --git a/data/maps/text/Route131.s b/data/text/maps/Route131.s
index e69de29bb..e69de29bb 100644
--- a/data/maps/text/Route131.s
+++ b/data/text/maps/Route131.s
diff --git a/data/maps/text/Route132.s b/data/text/maps/Route132.s
index e69de29bb..e69de29bb 100644
--- a/data/maps/text/Route132.s
+++ b/data/text/maps/Route132.s
diff --git a/data/maps/text/Route133.s b/data/text/maps/Route133.s
index e69de29bb..e69de29bb 100644
--- a/data/maps/text/Route133.s
+++ b/data/text/maps/Route133.s
diff --git a/data/maps/text/Route134.s b/data/text/maps/Route134.s
index e69de29bb..e69de29bb 100644
--- a/data/maps/text/Route134.s
+++ b/data/text/maps/Route134.s
diff --git a/data/maps/text/RustboroCity.s b/data/text/maps/RustboroCity.s
index 54b658c01..54b658c01 100644
--- a/data/maps/text/RustboroCity.s
+++ b/data/text/maps/RustboroCity.s
diff --git a/data/maps/text/RustboroCity_CuttersHouse.s b/data/text/maps/RustboroCity_CuttersHouse.s
index dc0c394c1..dc0c394c1 100644
--- a/data/maps/text/RustboroCity_CuttersHouse.s
+++ b/data/text/maps/RustboroCity_CuttersHouse.s
diff --git a/data/maps/text/RustboroCity_DevonCorp_1F.s b/data/text/maps/RustboroCity_DevonCorp_1F.s
index 09f130ea8..09f130ea8 100644
--- a/data/maps/text/RustboroCity_DevonCorp_1F.s
+++ b/data/text/maps/RustboroCity_DevonCorp_1F.s
diff --git a/data/maps/text/RustboroCity_DevonCorp_2F.s b/data/text/maps/RustboroCity_DevonCorp_2F.s
index de37c8266..de37c8266 100644
--- a/data/maps/text/RustboroCity_DevonCorp_2F.s
+++ b/data/text/maps/RustboroCity_DevonCorp_2F.s
diff --git a/data/maps/text/RustboroCity_DevonCorp_3F.s b/data/text/maps/RustboroCity_DevonCorp_3F.s
index 011513d8d..011513d8d 100644
--- a/data/maps/text/RustboroCity_DevonCorp_3F.s
+++ b/data/text/maps/RustboroCity_DevonCorp_3F.s
diff --git a/data/maps/text/RustboroCity_Flat1_1F.s b/data/text/maps/RustboroCity_Flat1_1F.s
index afd8384b7..afd8384b7 100644
--- a/data/maps/text/RustboroCity_Flat1_1F.s
+++ b/data/text/maps/RustboroCity_Flat1_1F.s
diff --git a/data/maps/text/RustboroCity_Flat1_2F.s b/data/text/maps/RustboroCity_Flat1_2F.s
index 79553bf9c..79553bf9c 100644
--- a/data/maps/text/RustboroCity_Flat1_2F.s
+++ b/data/text/maps/RustboroCity_Flat1_2F.s
diff --git a/data/maps/text/RustboroCity_Flat2_1F.s b/data/text/maps/RustboroCity_Flat2_1F.s
index 9ae0b72d7..9ae0b72d7 100644
--- a/data/maps/text/RustboroCity_Flat2_1F.s
+++ b/data/text/maps/RustboroCity_Flat2_1F.s
diff --git a/data/maps/text/RustboroCity_Flat2_2F.s b/data/text/maps/RustboroCity_Flat2_2F.s
index 797b6f810..797b6f810 100644
--- a/data/maps/text/RustboroCity_Flat2_2F.s
+++ b/data/text/maps/RustboroCity_Flat2_2F.s
diff --git a/data/maps/text/RustboroCity_Flat2_3F.s b/data/text/maps/RustboroCity_Flat2_3F.s
index bb05f1932..bb05f1932 100644
--- a/data/maps/text/RustboroCity_Flat2_3F.s
+++ b/data/text/maps/RustboroCity_Flat2_3F.s
diff --git a/data/maps/text/RustboroCity_Gym.s b/data/text/maps/RustboroCity_Gym.s
index e87ecbd6e..e87ecbd6e 100644
--- a/data/maps/text/RustboroCity_Gym.s
+++ b/data/text/maps/RustboroCity_Gym.s
diff --git a/data/maps/text/RustboroCity_House1.s b/data/text/maps/RustboroCity_House1.s
index 2835b8abe..2835b8abe 100644
--- a/data/maps/text/RustboroCity_House1.s
+++ b/data/text/maps/RustboroCity_House1.s
diff --git a/data/maps/text/RustboroCity_House2.s b/data/text/maps/RustboroCity_House2.s
index fba2dc73c..fba2dc73c 100644
--- a/data/maps/text/RustboroCity_House2.s
+++ b/data/text/maps/RustboroCity_House2.s
diff --git a/data/maps/text/RustboroCity_House3.s b/data/text/maps/RustboroCity_House3.s
index 69c64c3d4..69c64c3d4 100644
--- a/data/maps/text/RustboroCity_House3.s
+++ b/data/text/maps/RustboroCity_House3.s
diff --git a/data/maps/text/RustboroCity_Mart.s b/data/text/maps/RustboroCity_Mart.s
index 48b5ea874..48b5ea874 100644
--- a/data/maps/text/RustboroCity_Mart.s
+++ b/data/text/maps/RustboroCity_Mart.s
diff --git a/data/maps/text/RustboroCity_PokemonCenter_1F.s b/data/text/maps/RustboroCity_PokemonCenter_1F.s
index be48ec5c8..be48ec5c8 100644
--- a/data/maps/text/RustboroCity_PokemonCenter_1F.s
+++ b/data/text/maps/RustboroCity_PokemonCenter_1F.s
diff --git a/data/maps/text/RustboroCity_PokemonSchool.s b/data/text/maps/RustboroCity_PokemonSchool.s
index a6cd855c4..a6cd855c4 100644
--- a/data/maps/text/RustboroCity_PokemonSchool.s
+++ b/data/text/maps/RustboroCity_PokemonSchool.s
diff --git a/data/maps/text/RusturfTunnel.s b/data/text/maps/RusturfTunnel.s
index 4905383e0..4905383e0 100644
--- a/data/maps/text/RusturfTunnel.s
+++ b/data/text/maps/RusturfTunnel.s
diff --git a/data/maps/text/SSTidalCorridor.s b/data/text/maps/SSTidalCorridor.s
index 530ff6c55..530ff6c55 100644
--- a/data/maps/text/SSTidalCorridor.s
+++ b/data/text/maps/SSTidalCorridor.s
diff --git a/data/maps/text/SSTidalLowerDeck.s b/data/text/maps/SSTidalLowerDeck.s
index 8792f18d5..8792f18d5 100644
--- a/data/maps/text/SSTidalLowerDeck.s
+++ b/data/text/maps/SSTidalLowerDeck.s
diff --git a/data/maps/text/SSTidalRooms.s b/data/text/maps/SSTidalRooms.s
index a0f9000d3..a0f9000d3 100644
--- a/data/maps/text/SSTidalRooms.s
+++ b/data/text/maps/SSTidalRooms.s
diff --git a/data/maps/text/SafariZone_Northeast.s b/data/text/maps/SafariZone_Northeast.s
index 5134aa15f..5134aa15f 100644
--- a/data/maps/text/SafariZone_Northeast.s
+++ b/data/text/maps/SafariZone_Northeast.s
diff --git a/data/maps/text/SafariZone_Northwest.s b/data/text/maps/SafariZone_Northwest.s
index cb7046baf..cb7046baf 100644
--- a/data/maps/text/SafariZone_Northwest.s
+++ b/data/text/maps/SafariZone_Northwest.s
diff --git a/data/maps/text/SafariZone_RestHouse.s b/data/text/maps/SafariZone_RestHouse.s
index 8b1378917..8b1378917 100644
--- a/data/maps/text/SafariZone_RestHouse.s
+++ b/data/text/maps/SafariZone_RestHouse.s
diff --git a/data/maps/text/SafariZone_Southeast.s b/data/text/maps/SafariZone_Southeast.s
index 3f8e7df99..3f8e7df99 100644
--- a/data/maps/text/SafariZone_Southeast.s
+++ b/data/text/maps/SafariZone_Southeast.s
diff --git a/data/maps/text/SafariZone_Southwest.s b/data/text/maps/SafariZone_Southwest.s
index de7d9913b..de7d9913b 100644
--- a/data/maps/text/SafariZone_Southwest.s
+++ b/data/text/maps/SafariZone_Southwest.s
diff --git a/data/maps/text/SeafloorCavern_Room1.s b/data/text/maps/SeafloorCavern_Room1.s
index 7200026f6..7200026f6 100644
--- a/data/maps/text/SeafloorCavern_Room1.s
+++ b/data/text/maps/SeafloorCavern_Room1.s
diff --git a/data/maps/text/SeafloorCavern_Room3.s b/data/text/maps/SeafloorCavern_Room3.s
index f23b5ab28..f23b5ab28 100644
--- a/data/maps/text/SeafloorCavern_Room3.s
+++ b/data/text/maps/SeafloorCavern_Room3.s
diff --git a/data/maps/text/SeafloorCavern_Room4.s b/data/text/maps/SeafloorCavern_Room4.s
index 2dd1ac5bd..2dd1ac5bd 100644
--- a/data/maps/text/SeafloorCavern_Room4.s
+++ b/data/text/maps/SeafloorCavern_Room4.s
diff --git a/data/maps/text/SeafloorCavern_Room9.s b/data/text/maps/SeafloorCavern_Room9.s
index 77f2ac9f8..77f2ac9f8 100644
--- a/data/maps/text/SeafloorCavern_Room9.s
+++ b/data/text/maps/SeafloorCavern_Room9.s
diff --git a/data/maps/text/SealedChamber_InnerRoom.s b/data/text/maps/SealedChamber_InnerRoom.s
index c62da87ce..c62da87ce 100644
--- a/data/maps/text/SealedChamber_InnerRoom.s
+++ b/data/text/maps/SealedChamber_InnerRoom.s
diff --git a/data/maps/text/SealedChamber_OuterRoom.s b/data/text/maps/SealedChamber_OuterRoom.s
index fdfea3c66..fdfea3c66 100644
--- a/data/maps/text/SealedChamber_OuterRoom.s
+++ b/data/text/maps/SealedChamber_OuterRoom.s
diff --git a/data/maps/text/SecretBase_RedCave1.s b/data/text/maps/SecretBase_RedCave1.s
index 1258599b8..1258599b8 100644
--- a/data/maps/text/SecretBase_RedCave1.s
+++ b/data/text/maps/SecretBase_RedCave1.s
diff --git a/data/maps/text/ShoalCave_LowTideEntranceRoom.s b/data/text/maps/ShoalCave_LowTideEntranceRoom.s
index 8b1378917..8b1378917 100644
--- a/data/maps/text/ShoalCave_LowTideEntranceRoom.s
+++ b/data/text/maps/ShoalCave_LowTideEntranceRoom.s
diff --git a/data/maps/text/ShoalCave_LowTideInnerRoom.s b/data/text/maps/ShoalCave_LowTideInnerRoom.s
index 8b1378917..8b1378917 100644
--- a/data/maps/text/ShoalCave_LowTideInnerRoom.s
+++ b/data/text/maps/ShoalCave_LowTideInnerRoom.s
diff --git a/data/maps/text/ShoalCave_LowTideLowerRoom.s b/data/text/maps/ShoalCave_LowTideLowerRoom.s
index b59cb0378..b59cb0378 100644
--- a/data/maps/text/ShoalCave_LowTideLowerRoom.s
+++ b/data/text/maps/ShoalCave_LowTideLowerRoom.s
diff --git a/data/maps/text/ShoalCave_LowTideStairsRoom.s b/data/text/maps/ShoalCave_LowTideStairsRoom.s
index 8b1378917..8b1378917 100644
--- a/data/maps/text/ShoalCave_LowTideStairsRoom.s
+++ b/data/text/maps/ShoalCave_LowTideStairsRoom.s
diff --git a/data/maps/text/SingleBattleColosseum.s b/data/text/maps/SingleBattleColosseum.s
index 1743b5841..1743b5841 100644
--- a/data/maps/text/SingleBattleColosseum.s
+++ b/data/text/maps/SingleBattleColosseum.s
diff --git a/data/maps/text/SlateportCity.s b/data/text/maps/SlateportCity.s
index bcad42f2d..bcad42f2d 100644
--- a/data/maps/text/SlateportCity.s
+++ b/data/text/maps/SlateportCity.s
diff --git a/data/maps/text/SlateportCity_ContestHall.s b/data/text/maps/SlateportCity_ContestHall.s
index edc29d872..edc29d872 100644
--- a/data/maps/text/SlateportCity_ContestHall.s
+++ b/data/text/maps/SlateportCity_ContestHall.s
diff --git a/data/maps/text/SlateportCity_ContestLobby.s b/data/text/maps/SlateportCity_ContestLobby.s
index a4f42c1b0..a4f42c1b0 100644
--- a/data/maps/text/SlateportCity_ContestLobby.s
+++ b/data/text/maps/SlateportCity_ContestLobby.s
diff --git a/data/maps/text/SlateportCity_Harbor.s b/data/text/maps/SlateportCity_Harbor.s
index 06c82f94b..06c82f94b 100644
--- a/data/maps/text/SlateportCity_Harbor.s
+++ b/data/text/maps/SlateportCity_Harbor.s
diff --git a/data/maps/text/SlateportCity_House1.s b/data/text/maps/SlateportCity_House1.s
index dad8b0c5b..dad8b0c5b 100644
--- a/data/maps/text/SlateportCity_House1.s
+++ b/data/text/maps/SlateportCity_House1.s
diff --git a/data/maps/text/SlateportCity_House2.s b/data/text/maps/SlateportCity_House2.s
index 8ae21ce9a..8ae21ce9a 100644
--- a/data/maps/text/SlateportCity_House2.s
+++ b/data/text/maps/SlateportCity_House2.s
diff --git a/data/maps/text/SlateportCity_Mart.s b/data/text/maps/SlateportCity_Mart.s
index 336b32d9b..336b32d9b 100644
--- a/data/maps/text/SlateportCity_Mart.s
+++ b/data/text/maps/SlateportCity_Mart.s
diff --git a/data/maps/text/SlateportCity_OceanicMuseum_1F.s b/data/text/maps/SlateportCity_OceanicMuseum_1F.s
index 7ef418d39..7ef418d39 100644
--- a/data/maps/text/SlateportCity_OceanicMuseum_1F.s
+++ b/data/text/maps/SlateportCity_OceanicMuseum_1F.s
diff --git a/data/maps/text/SlateportCity_OceanicMuseum_2F.s b/data/text/maps/SlateportCity_OceanicMuseum_2F.s
index e1f087543..e1f087543 100644
--- a/data/maps/text/SlateportCity_OceanicMuseum_2F.s
+++ b/data/text/maps/SlateportCity_OceanicMuseum_2F.s
diff --git a/data/maps/text/SlateportCity_PokemonCenter_1F.s b/data/text/maps/SlateportCity_PokemonCenter_1F.s
index 549cca714..549cca714 100644
--- a/data/maps/text/SlateportCity_PokemonCenter_1F.s
+++ b/data/text/maps/SlateportCity_PokemonCenter_1F.s
diff --git a/data/maps/text/SlateportCity_PokemonFanClub.s b/data/text/maps/SlateportCity_PokemonFanClub.s
index 5bb7c1aeb..5bb7c1aeb 100644
--- a/data/maps/text/SlateportCity_PokemonFanClub.s
+++ b/data/text/maps/SlateportCity_PokemonFanClub.s
diff --git a/data/maps/text/SlateportCity_SternsShipyard_1F.s b/data/text/maps/SlateportCity_SternsShipyard_1F.s
index 35dbb3bee..35dbb3bee 100644
--- a/data/maps/text/SlateportCity_SternsShipyard_1F.s
+++ b/data/text/maps/SlateportCity_SternsShipyard_1F.s
diff --git a/data/maps/text/SlateportCity_SternsShipyard_2F.s b/data/text/maps/SlateportCity_SternsShipyard_2F.s
index 8262216fc..8262216fc 100644
--- a/data/maps/text/SlateportCity_SternsShipyard_2F.s
+++ b/data/text/maps/SlateportCity_SternsShipyard_2F.s
diff --git a/data/maps/text/SootopolisCity.s b/data/text/maps/SootopolisCity.s
index 3c2575b99..3c2575b99 100644
--- a/data/maps/text/SootopolisCity.s
+++ b/data/text/maps/SootopolisCity.s
diff --git a/data/maps/text/SootopolisCity_Gym_1F.s b/data/text/maps/SootopolisCity_Gym_1F.s
index 1047a5326..1047a5326 100644
--- a/data/maps/text/SootopolisCity_Gym_1F.s
+++ b/data/text/maps/SootopolisCity_Gym_1F.s
diff --git a/data/maps/text/SootopolisCity_Gym_B1F.s b/data/text/maps/SootopolisCity_Gym_B1F.s
index 8b1378917..8b1378917 100644
--- a/data/maps/text/SootopolisCity_Gym_B1F.s
+++ b/data/text/maps/SootopolisCity_Gym_B1F.s
diff --git a/data/maps/text/SootopolisCity_House1.s b/data/text/maps/SootopolisCity_House1.s
index 57ae71945..57ae71945 100644
--- a/data/maps/text/SootopolisCity_House1.s
+++ b/data/text/maps/SootopolisCity_House1.s
diff --git a/data/maps/text/SootopolisCity_House2.s b/data/text/maps/SootopolisCity_House2.s
index 42ed0a803..42ed0a803 100644
--- a/data/maps/text/SootopolisCity_House2.s
+++ b/data/text/maps/SootopolisCity_House2.s
diff --git a/data/maps/text/SootopolisCity_House3.s b/data/text/maps/SootopolisCity_House3.s
index 4bc270f16..4bc270f16 100644
--- a/data/maps/text/SootopolisCity_House3.s
+++ b/data/text/maps/SootopolisCity_House3.s
diff --git a/data/maps/text/SootopolisCity_House4.s b/data/text/maps/SootopolisCity_House4.s
index 5d49f5cf7..5d49f5cf7 100644
--- a/data/maps/text/SootopolisCity_House4.s
+++ b/data/text/maps/SootopolisCity_House4.s
diff --git a/data/maps/text/SootopolisCity_House5.s b/data/text/maps/SootopolisCity_House5.s
index 9fca78e0f..9fca78e0f 100644
--- a/data/maps/text/SootopolisCity_House5.s
+++ b/data/text/maps/SootopolisCity_House5.s
diff --git a/data/maps/text/SootopolisCity_House6.s b/data/text/maps/SootopolisCity_House6.s
index 895719f84..895719f84 100644
--- a/data/maps/text/SootopolisCity_House6.s
+++ b/data/text/maps/SootopolisCity_House6.s
diff --git a/data/maps/text/SootopolisCity_House7.s b/data/text/maps/SootopolisCity_House7.s
index 027ea91e5..027ea91e5 100644
--- a/data/maps/text/SootopolisCity_House7.s
+++ b/data/text/maps/SootopolisCity_House7.s
diff --git a/data/maps/text/SootopolisCity_House8.s b/data/text/maps/SootopolisCity_House8.s
index cb1046272..cb1046272 100644
--- a/data/maps/text/SootopolisCity_House8.s
+++ b/data/text/maps/SootopolisCity_House8.s
diff --git a/data/maps/text/SootopolisCity_Mart.s b/data/text/maps/SootopolisCity_Mart.s
index e45624067..e45624067 100644
--- a/data/maps/text/SootopolisCity_Mart.s
+++ b/data/text/maps/SootopolisCity_Mart.s
diff --git a/data/maps/text/SootopolisCity_PokemonCenter_1F.s b/data/text/maps/SootopolisCity_PokemonCenter_1F.s
index e8a78c9b6..e8a78c9b6 100644
--- a/data/maps/text/SootopolisCity_PokemonCenter_1F.s
+++ b/data/text/maps/SootopolisCity_PokemonCenter_1F.s
diff --git a/data/maps/text/SouthernIsland_Exterior.s b/data/text/maps/SouthernIsland_Exterior.s
index 8b1378917..8b1378917 100644
--- a/data/maps/text/SouthernIsland_Exterior.s
+++ b/data/text/maps/SouthernIsland_Exterior.s
diff --git a/data/maps/text/SouthernIsland_Interior.s b/data/text/maps/SouthernIsland_Interior.s
index 8b1378917..8b1378917 100644
--- a/data/maps/text/SouthernIsland_Interior.s
+++ b/data/text/maps/SouthernIsland_Interior.s
diff --git a/data/maps/text/TradeCenter.s b/data/text/maps/TradeCenter.s
index 62b14b737..62b14b737 100644
--- a/data/maps/text/TradeCenter.s
+++ b/data/text/maps/TradeCenter.s
diff --git a/data/maps/text/Underwater_SeafloorCavern.s b/data/text/maps/Underwater_SeafloorCavern.s
index 80153230f..80153230f 100644
--- a/data/maps/text/Underwater_SeafloorCavern.s
+++ b/data/text/maps/Underwater_SeafloorCavern.s
diff --git a/data/maps/text/VerdanturfTown.s b/data/text/maps/VerdanturfTown.s
index 7cdd8b9bc..7cdd8b9bc 100644
--- a/data/maps/text/VerdanturfTown.s
+++ b/data/text/maps/VerdanturfTown.s
diff --git a/data/maps/text/VerdanturfTown_ContestHall.s b/data/text/maps/VerdanturfTown_ContestHall.s
index fda2a8022..fda2a8022 100644
--- a/data/maps/text/VerdanturfTown_ContestHall.s
+++ b/data/text/maps/VerdanturfTown_ContestHall.s
diff --git a/data/maps/text/VerdanturfTown_ContestLobby.s b/data/text/maps/VerdanturfTown_ContestLobby.s
index 8c2240ba9..8c2240ba9 100644
--- a/data/maps/text/VerdanturfTown_ContestLobby.s
+++ b/data/text/maps/VerdanturfTown_ContestLobby.s
diff --git a/data/maps/text/VerdanturfTown_FriendshipRatersHouse.s b/data/text/maps/VerdanturfTown_FriendshipRatersHouse.s
index 9d8e968b6..9d8e968b6 100644
--- a/data/maps/text/VerdanturfTown_FriendshipRatersHouse.s
+++ b/data/text/maps/VerdanturfTown_FriendshipRatersHouse.s
diff --git a/data/maps/text/VerdanturfTown_House.s b/data/text/maps/VerdanturfTown_House.s
index 8cdb826c3..8cdb826c3 100644
--- a/data/maps/text/VerdanturfTown_House.s
+++ b/data/text/maps/VerdanturfTown_House.s
diff --git a/data/maps/text/VerdanturfTown_Mart.s b/data/text/maps/VerdanturfTown_Mart.s
index 6bdb54ecd..6bdb54ecd 100644
--- a/data/maps/text/VerdanturfTown_Mart.s
+++ b/data/text/maps/VerdanturfTown_Mart.s
diff --git a/data/maps/text/VerdanturfTown_PokemonCenter_1F.s b/data/text/maps/VerdanturfTown_PokemonCenter_1F.s
index 950922b45..950922b45 100644
--- a/data/maps/text/VerdanturfTown_PokemonCenter_1F.s
+++ b/data/text/maps/VerdanturfTown_PokemonCenter_1F.s
diff --git a/data/maps/text/VerdanturfTown_WandasHouse.s b/data/text/maps/VerdanturfTown_WandasHouse.s
index 684a4c2a3..684a4c2a3 100644
--- a/data/maps/text/VerdanturfTown_WandasHouse.s
+++ b/data/text/maps/VerdanturfTown_WandasHouse.s
diff --git a/data/maps/text/VictoryRoad_1F.s b/data/text/maps/VictoryRoad_1F.s
index d4aaa0943..d4aaa0943 100644
--- a/data/maps/text/VictoryRoad_1F.s
+++ b/data/text/maps/VictoryRoad_1F.s
diff --git a/data/maps/text/VictoryRoad_B1F.s b/data/text/maps/VictoryRoad_B1F.s
index 33a34b871..33a34b871 100644
--- a/data/maps/text/VictoryRoad_B1F.s
+++ b/data/text/maps/VictoryRoad_B1F.s
diff --git a/data/maps/text/VictoryRoad_B2F.s b/data/text/maps/VictoryRoad_B2F.s
index fe7477979..fe7477979 100644
--- a/data/maps/text/VictoryRoad_B2F.s
+++ b/data/text/maps/VictoryRoad_B2F.s