1038 files changed, 1036 insertions, 1036 deletions

diff --git a/data/event_scripts.s b/data/event_scripts.s
index e18dec836..4ad0ad60d 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -59,376 +59,376 @@ gStdScripts_End:: @ 81DC2CC
 	map_script 2, PetalburgCity_MapScript2_1DC31C
 	.byte 0
 
-	.include "data/scripts/maps/PetalburgCity.inc"
-	.include "data/scripts/maps/SlateportCity.inc"
-	.include "data/scripts/maps/MauvilleCity.inc"
-	.include "data/scripts/maps/RustboroCity.inc"
-	.include "data/scripts/maps/FortreeCity.inc"
-	.include "data/scripts/maps/LilycoveCity.inc"
-	.include "data/scripts/maps/MossdeepCity.inc"
-	.include "data/scripts/maps/SootopolisCity.inc"
-	.include "data/scripts/maps/EverGrandeCity.inc"
-	.include "data/scripts/maps/LittlerootTown.inc"
-	.include "data/scripts/maps/OldaleTown.inc"
-	.include "data/scripts/maps/DewfordTown.inc"
-	.include "data/scripts/maps/LavaridgeTown.inc"
-	.include "data/scripts/maps/FallarborTown.inc"
-	.include "data/scripts/maps/VerdanturfTown.inc"
-	.include "data/scripts/maps/PacifidlogTown.inc"
-	.include "data/scripts/maps/Route101.inc"
-	.include "data/scripts/maps/Route102.inc"
-	.include "data/scripts/maps/Route103.inc"
-	.include "data/scripts/maps/Route104.inc"
-	.include "data/scripts/maps/Route105.inc"
-	.include "data/scripts/maps/Route106.inc"
-	.include "data/scripts/maps/Route107.inc"
-	.include "data/scripts/maps/Route108.inc"
-	.include "data/scripts/maps/Route109.inc"
-	.include "data/scripts/maps/Route110.inc"
-	.include "data/scripts/maps/Route111.inc"
-	.include "data/scripts/maps/Route112.inc"
-	.include "data/scripts/maps/Route113.inc"
-	.include "data/scripts/maps/Route114.inc"
-	.include "data/scripts/maps/Route115.inc"
-	.include "data/scripts/maps/Route116.inc"
-	.include "data/scripts/maps/Route117.inc"
-	.include "data/scripts/maps/Route118.inc"
-	.include "data/scripts/maps/Route119.inc"
-	.include "data/scripts/maps/Route120.inc"
-	.include "data/scripts/maps/Route121.inc"
-	.include "data/scripts/maps/Route122.inc"
-	.include "data/scripts/maps/Route123.inc"
-	.include "data/scripts/maps/Route124.inc"
-	.include "data/scripts/maps/Route125.inc"
-	.include "data/scripts/maps/Route126.inc"
-	.include "data/scripts/maps/Route127.inc"
-	.include "data/scripts/maps/Route128.inc"
-	.include "data/scripts/maps/Route129.inc"
-	.include "data/scripts/maps/Route130.inc"
-	.include "data/scripts/maps/Route131.inc"
-	.include "data/scripts/maps/Route132.inc"
-	.include "data/scripts/maps/Route133.inc"
-	.include "data/scripts/maps/Route134.inc"
-	.include "data/scripts/maps/Underwater1.inc"
-	.include "data/scripts/maps/Underwater2.inc"
-	.include "data/scripts/maps/Underwater3.inc"
-	.include "data/scripts/maps/Underwater4.inc"
-	.include "data/scripts/maps/Underwater5.inc"
-	.include "data/scripts/maps/Underwater6.inc"
-	.include "data/scripts/maps/Underwater7.inc"
-	.include "data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc"
-	.include "data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc"
-	.include "data/scripts/maps/LittlerootTown_MaysHouse_1F.inc"
-	.include "data/scripts/maps/LittlerootTown_MaysHouse_2F.inc"
-	.include "data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc"
-	.include "data/scripts/maps/OldaleTown_House1.inc"
-	.include "data/scripts/maps/OldaleTown_House2.inc"
-	.include "data/scripts/maps/OldaleTown_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/OldaleTown_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/OldaleTown_Mart.inc"
-	.include "data/scripts/maps/DewfordTown_House1.inc"
-	.include "data/scripts/maps/DewfordTown_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/DewfordTown_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/DewfordTown_Gym.inc"
-	.include "data/scripts/maps/DewfordTown_Hall.inc"
-	.include "data/scripts/maps/DewfordTown_House2.inc"
-	.include "data/scripts/maps/LavaridgeTown_HerbShop.inc"
-	.include "data/scripts/maps/LavaridgeTown_Gym_1F.inc"
-	.include "data/scripts/maps/LavaridgeTown_Gym_B1F.inc"
-	.include "data/scripts/maps/LavaridgeTown_House.inc"
-	.include "data/scripts/maps/LavaridgeTown_Mart.inc"
-	.include "data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/LavaridgeTown_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/FallarborTown_Mart.inc"
-	.include "data/scripts/maps/FallarborTown_BattleTentLobby.inc"
-	.include "data/scripts/maps/FallarborTown_BattleTentCorridor.inc"
-	.include "data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc"
-	.include "data/scripts/maps/FallarborTown_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/FallarborTown_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/FallarborTown_House1.inc"
-	.include "data/scripts/maps/FallarborTown_House2.inc"
-	.include "data/scripts/maps/VerdanturfTown_BattleTentLobby.inc"
-	.include "data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc"
-	.include "data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc"
-	.include "data/scripts/maps/VerdanturfTown_Mart.inc"
-	.include "data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/VerdanturfTown_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/VerdanturfTown_WandasHouse.inc"
-	.include "data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc"
-	.include "data/scripts/maps/VerdanturfTown_House.inc"
-	.include "data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/PacifidlogTown_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/PacifidlogTown_House1.inc"
-	.include "data/scripts/maps/PacifidlogTown_House2.inc"
-	.include "data/scripts/maps/PacifidlogTown_House3.inc"
-	.include "data/scripts/maps/PacifidlogTown_House4.inc"
-	.include "data/scripts/maps/PacifidlogTown_House5.inc"
-	.include "data/scripts/maps/PetalburgCity_WallysHouse.inc"
-	.include "data/scripts/maps/PetalburgCity_Gym.inc"
-	.include "data/scripts/maps/PetalburgCity_House1.inc"
-	.include "data/scripts/maps/PetalburgCity_House2.inc"
-	.include "data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/PetalburgCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/PetalburgCity_Mart.inc"
-	.include "data/scripts/maps/SlateportCity_SternsShipyard_1F.inc"
-	.include "data/scripts/maps/SlateportCity_SternsShipyard_2F.inc"
-	.include "data/scripts/maps/SlateportCity_BattleTentLobby.inc"
-	.include "data/scripts/maps/SlateportCity_BattleTentCorridor.inc"
-	.include "data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc"
-	.include "data/scripts/maps/SlateportCity_House1.inc"
-	.include "data/scripts/maps/SlateportCity_PokemonFanClub.inc"
-	.include "data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc"
-	.include "data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc"
-	.include "data/scripts/maps/SlateportCity_Harbor.inc"
-	.include "data/scripts/maps/SlateportCity_House2.inc"
-	.include "data/scripts/maps/SlateportCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/SlateportCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/SlateportCity_Mart.inc"
-	.include "data/scripts/maps/MauvilleCity_Gym.inc"
-	.include "data/scripts/maps/MauvilleCity_BikeShop.inc"
-	.include "data/scripts/maps/MauvilleCity_House1.inc"
-	.include "data/scripts/maps/MauvilleCity_GameCorner.inc"
-	.include "data/scripts/maps/MauvilleCity_House2.inc"
-	.include "data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/MauvilleCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/MauvilleCity_Mart.inc"
-	.include "data/scripts/maps/RustboroCity_DevonCorp_1F.inc"
-	.include "data/scripts/maps/RustboroCity_DevonCorp_2F.inc"
-	.include "data/scripts/maps/RustboroCity_DevonCorp_3F.inc"
-	.include "data/scripts/maps/RustboroCity_Gym.inc"
-	.include "data/scripts/maps/RustboroCity_PokemonSchool.inc"
-	.include "data/scripts/maps/RustboroCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/RustboroCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/RustboroCity_Mart.inc"
-	.include "data/scripts/maps/RustboroCity_Flat1_1F.inc"
-	.include "data/scripts/maps/RustboroCity_Flat1_2F.inc"
-	.include "data/scripts/maps/RustboroCity_House1.inc"
-	.include "data/scripts/maps/RustboroCity_CuttersHouse.inc"
-	.include "data/scripts/maps/RustboroCity_House2.inc"
-	.include "data/scripts/maps/RustboroCity_Flat2_1F.inc"
-	.include "data/scripts/maps/RustboroCity_Flat2_2F.inc"
-	.include "data/scripts/maps/RustboroCity_Flat2_3F.inc"
-	.include "data/scripts/maps/RustboroCity_House3.inc"
-	.include "data/scripts/maps/FortreeCity_House1.inc"
-	.include "data/scripts/maps/FortreeCity_Gym.inc"
-	.include "data/scripts/maps/FortreeCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/FortreeCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/FortreeCity_Mart.inc"
-	.include "data/scripts/maps/FortreeCity_House2.inc"
-	.include "data/scripts/maps/FortreeCity_House3.inc"
-	.include "data/scripts/maps/FortreeCity_House4.inc"
-	.include "data/scripts/maps/FortreeCity_House5.inc"
-	.include "data/scripts/maps/FortreeCity_DecorationShop.inc"
-	.include "data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc"
-	.include "data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc"
-	.include "data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc"
-	.include "data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc"
-	.include "data/scripts/maps/LilycoveCity_ContestLobby.inc"
-	.include "data/scripts/maps/LilycoveCity_ContestHall.inc"
-	.include "data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/LilycoveCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/LilycoveCity_UnusedMart.inc"
-	.include "data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc"
-	.include "data/scripts/maps/LilycoveCity_Harbor.inc"
-	.include "data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc"
-	.include "data/scripts/maps/LilycoveCity_House1.inc"
-	.include "data/scripts/maps/LilycoveCity_House2.inc"
-	.include "data/scripts/maps/LilycoveCity_House3.inc"
-	.include "data/scripts/maps/LilycoveCity_House4.inc"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc"
-	.include "data/scripts/maps/MossdeepCity_Gym.inc"
-	.include "data/scripts/maps/MossdeepCity_House1.inc"
-	.include "data/scripts/maps/MossdeepCity_House2.inc"
-	.include "data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/MossdeepCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/MossdeepCity_Mart.inc"
-	.include "data/scripts/maps/MossdeepCity_House3.inc"
-	.include "data/scripts/maps/MossdeepCity_StevensHouse.inc"
-	.include "data/scripts/maps/MossdeepCity_House4.inc"
-	.include "data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc"
-	.include "data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc"
-	.include "data/scripts/maps/MossdeepCity_GameCorner_1F.inc"
-	.include "data/scripts/maps/MossdeepCity_GameCorner_B1F.inc"
-	.include "data/scripts/maps/SootopolisCity_Gym_1F.inc"
-	.include "data/scripts/maps/SootopolisCity_Gym_B1F.inc"
-	.include "data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/SootopolisCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/SootopolisCity_Mart.inc"
-	.include "data/scripts/maps/SootopolisCity_House1.inc"
-	.include "data/scripts/maps/SootopolisCity_House2.inc"
-	.include "data/scripts/maps/SootopolisCity_House3.inc"
-	.include "data/scripts/maps/SootopolisCity_House4.inc"
-	.include "data/scripts/maps/SootopolisCity_House5.inc"
-	.include "data/scripts/maps/SootopolisCity_House6.inc"
-	.include "data/scripts/maps/SootopolisCity_House7.inc"
-	.include "data/scripts/maps/SootopolisCity_LotadAndSeedotHouse.inc"
-	.include "data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc"
-	.include "data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc"
-	.include "data/scripts/maps/EverGrandeCity_SidneysRoom.inc"
-	.include "data/scripts/maps/EverGrandeCity_PhoebesRoom.inc"
-	.include "data/scripts/maps/EverGrandeCity_GlaciasRoom.inc"
-	.include "data/scripts/maps/EverGrandeCity_DrakesRoom.inc"
-	.include "data/scripts/maps/EverGrandeCity_ChampionsRoom.inc"
-	.include "data/scripts/maps/EverGrandeCity_Hall1.inc"
-	.include "data/scripts/maps/EverGrandeCity_Hall2.inc"
-	.include "data/scripts/maps/EverGrandeCity_Hall3.inc"
-	.include "data/scripts/maps/EverGrandeCity_Hall4.inc"
-	.include "data/scripts/maps/EverGrandeCity_Hall5.inc"
-	.include "data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc"
-	.include "data/scripts/maps/EverGrandeCity_HallOfFame.inc"
-	.include "data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/EverGrandeCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/EverGrandeCity_PokemonLeague_2F.inc"
-	.include "data/scripts/maps/Route104_MrBrineysHouse.inc"
-	.include "data/scripts/maps/Route104_PrettyPetalFlowerShop.inc"
-	.include "data/scripts/maps/Route111_WinstrateFamilysHouse.inc"
-	.include "data/scripts/maps/Route111_OldLadysRestStop.inc"
-	.include "data/scripts/maps/Route112_CableCarStation.inc"
-	.include "data/scripts/maps/MtChimney_CableCarStation.inc"
-	.include "data/scripts/maps/Route114_FossilManiacsHouse.inc"
-	.include "data/scripts/maps/Route114_FossilManiacsTunnel.inc"
-	.include "data/scripts/maps/Route114_LanettesHouse.inc"
-	.include "data/scripts/maps/Route116_TunnelersRestHouse.inc"
-	.include "data/scripts/maps/Route117_PokemonDayCare.inc"
-	.include "data/scripts/maps/Route121_SafariZoneEntrance.inc"
-	.include "data/scripts/maps/MeteorFalls_1F_1R.inc"
-	.include "data/scripts/maps/MeteorFalls_1F_2R.inc"
-	.include "data/scripts/maps/MeteorFalls_B1F_1R.inc"
-	.include "data/scripts/maps/MeteorFalls_B1F_2R.inc"
-	.include "data/scripts/maps/RusturfTunnel.inc"
-	.include "data/scripts/maps/Underwater_SootopolisCity.inc"
-	.include "data/scripts/maps/DesertRuins.inc"
-	.include "data/scripts/maps/GraniteCave_1F.inc"
-	.include "data/scripts/maps/GraniteCave_B1F.inc"
-	.include "data/scripts/maps/GraniteCave_B2F.inc"
-	.include "data/scripts/maps/GraniteCave_StevensRoom.inc"
-	.include "data/scripts/maps/PetalburgWoods.inc"
-	.include "data/scripts/maps/MtChimney.inc"
-	.include "data/scripts/maps/JaggedPass.inc"
-	.include "data/scripts/maps/FieryPath.inc"
-	.include "data/scripts/maps/MtPyre_1F.inc"
-	.include "data/scripts/maps/MtPyre_2F.inc"
-	.include "data/scripts/maps/MtPyre_3F.inc"
-	.include "data/scripts/maps/MtPyre_4F.inc"
-	.include "data/scripts/maps/MtPyre_5F.inc"
-	.include "data/scripts/maps/MtPyre_6F.inc"
-	.include "data/scripts/maps/MtPyre_Exterior.inc"
-	.include "data/scripts/maps/MtPyre_Summit.inc"
-	.include "data/scripts/maps/AquaHideout_1F.inc"
-	.include "data/scripts/maps/AquaHideout_B1F.inc"
-	.include "data/scripts/maps/AquaHideout_B2F.inc"
-	.include "data/scripts/maps/Underwater_SeafloorCavern.inc"
-	.include "data/scripts/maps/SeafloorCavern_Entrance.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room1.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room2.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room3.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room4.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room5.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room6.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room7.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room8.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room9.inc"
-	.include "data/scripts/maps/CaveOfOrigin_Entrance.inc"
-	.include "data/scripts/maps/CaveOfOrigin_1F.inc"
-	.include "data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap1.inc"
-	.include "data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap2.inc"
-	.include "data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap3.inc"
-	.include "data/scripts/maps/CaveOfOrigin_B1F.inc"
-	.include "data/scripts/maps/VictoryRoad_1F.inc"
-	.include "data/scripts/maps/VictoryRoad_B1F.inc"
-	.include "data/scripts/maps/VictoryRoad_B2F.inc"
-	.include "data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc"
-	.include "data/scripts/maps/ShoalCave_LowTideInnerRoom.inc"
-	.include "data/scripts/maps/ShoalCave_LowTideStairsRoom.inc"
-	.include "data/scripts/maps/ShoalCave_LowTideLowerRoom.inc"
-	.include "data/scripts/maps/ShoalCave_HighTideEntranceRoom.inc"
-	.include "data/scripts/maps/ShoalCave_HighTideInnerRoom.inc"
-	.include "data/scripts/maps/NewMauville_Entrance.inc"
-	.include "data/scripts/maps/NewMauville_Inside.inc"
-	.include "data/scripts/maps/AbandonedShip_Deck.inc"
-	.include "data/scripts/maps/AbandonedShip_Corridors_1F.inc"
-	.include "data/scripts/maps/AbandonedShip_Rooms_1F.inc"
-	.include "data/scripts/maps/AbandonedShip_Corridors_B1F.inc"
-	.include "data/scripts/maps/AbandonedShip_Rooms_B1F.inc"
-	.include "data/scripts/maps/AbandonedShip_Rooms2_B1F.inc"
-	.include "data/scripts/maps/AbandonedShip_Underwater1.inc"
-	.include "data/scripts/maps/AbandonedShip_Room_B1F.inc"
-	.include "data/scripts/maps/AbandonedShip_Rooms2_1F.inc"
-	.include "data/scripts/maps/AbandonedShip_CaptainsOffice.inc"
-	.include "data/scripts/maps/AbandonedShip_Underwater2.inc"
-	.include "data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc"
-	.include "data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc"
-	.include "data/scripts/maps/IslandCave.inc"
-	.include "data/scripts/maps/AncientTomb.inc"
-	.include "data/scripts/maps/Underwater_Route134.inc"
-	.include "data/scripts/maps/Underwater_SealedChamber.inc"
-	.include "data/scripts/maps/SealedChamber_OuterRoom.inc"
-	.include "data/scripts/maps/SealedChamber_InnerRoom.inc"
-	.include "data/scripts/maps/ScorchedSlab.inc"
-	.include "data/scripts/maps/AquaHideout_UnusedRubyMap1.inc"
-	.include "data/scripts/maps/AquaHideout_UnusedRubyMap2.inc"
-	.include "data/scripts/maps/AquaHideout_UnusedRubyMap3.inc"
-	.include "data/scripts/maps/SkyPillar_Entrance.inc"
-	.include "data/scripts/maps/SkyPillar_Outside.inc"
-	.include "data/scripts/maps/SkyPillar_1F.inc"
-	.include "data/scripts/maps/SkyPillar_2F.inc"
-	.include "data/scripts/maps/SkyPillar_3F.inc"
-	.include "data/scripts/maps/SkyPillar_4F.inc"
-	.include "data/scripts/maps/ShoalCave_LowTideIceRoom.inc"
-	.include "data/scripts/maps/SkyPillar_5F.inc"
-	.include "data/scripts/maps/SkyPillar_Top.inc"
-	.include "data/scripts/maps/MagmaHideout_1F.inc"
-	.include "data/scripts/maps/MagmaHideout_2F_1R.inc"
-	.include "data/scripts/maps/MagmaHideout_2F_2R.inc"
-	.include "data/scripts/maps/MagmaHideout_3F_1R.inc"
-	.include "data/scripts/maps/MagmaHideout_3F_2R.inc"
-	.include "data/scripts/maps/MagmaHideout_4F.inc"
-	.include "data/scripts/maps/MagmaHideout_3F_3R.inc"
-	.include "data/scripts/maps/MagmaHideout_2F_3R.inc"
-	.include "data/scripts/maps/MirageTower_1F.inc"
-	.include "data/scripts/maps/MirageTower_2F.inc"
-	.include "data/scripts/maps/MirageTower_3F.inc"
-	.include "data/scripts/maps/MirageTower_4F.inc"
-	.include "data/scripts/maps/DesertUnderpass.inc"
-	.include "data/scripts/maps/ArtisanCave_B1F.inc"
-	.include "data/scripts/maps/ArtisanCave_1F.inc"
-	.include "data/scripts/maps/Underwater_MarineCave.inc"
-	.include "data/scripts/maps/MarineCave_Entrance.inc"
-	.include "data/scripts/maps/MarineCave_End.inc"
-	.include "data/scripts/maps/TerraCave_Entrance.inc"
-	.include "data/scripts/maps/TerraCave_End.inc"
-	.include "data/scripts/maps/AlteringCave.inc"
-	.include "data/scripts/maps/MeteorFalls_StevensCave.inc"
-	.include "data/scripts/maps/SecretBase_BlueCave1.inc"
-	.include "data/scripts/maps/SecretBase_BlueCave2.inc"
-	.include "data/scripts/maps/SecretBase_BlueCave3.inc"
-	.include "data/scripts/maps/SecretBase_BlueCave4.inc"
-	.include "data/scripts/maps/SecretBase_BrownCave1.inc"
-	.include "data/scripts/maps/SecretBase_BrownCave2.inc"
-	.include "data/scripts/maps/SecretBase_BrownCave3.inc"
-	.include "data/scripts/maps/SecretBase_BrownCave4.inc"
-	.include "data/scripts/maps/SecretBase_RedCave1.inc"
-	.include "data/scripts/maps/SecretBase_RedCave2.inc"
-	.include "data/scripts/maps/SecretBase_RedCave3.inc"
-	.include "data/scripts/maps/SecretBase_RedCave4.inc"
-	.include "data/scripts/maps/SecretBase_Shrub1.inc"
-	.include "data/scripts/maps/SecretBase_Shrub2.inc"
-	.include "data/scripts/maps/SecretBase_Shrub3.inc"
-	.include "data/scripts/maps/SecretBase_Shrub4.inc"
-	.include "data/scripts/maps/SecretBase_Tree1.inc"
-	.include "data/scripts/maps/SecretBase_Tree2.inc"
-	.include "data/scripts/maps/SecretBase_Tree3.inc"
-	.include "data/scripts/maps/SecretBase_Tree4.inc"
-	.include "data/scripts/maps/SecretBase_YellowCave1.inc"
-	.include "data/scripts/maps/SecretBase_YellowCave2.inc"
-	.include "data/scripts/maps/SecretBase_YellowCave3.inc"
-	.include "data/scripts/maps/SecretBase_YellowCave4.inc"
+	.include "data/maps/PetalburgCity/scripts.inc"
+	.include "data/maps/SlateportCity/scripts.inc"
+	.include "data/maps/MauvilleCity/scripts.inc"
+	.include "data/maps/RustboroCity/scripts.inc"
+	.include "data/maps/FortreeCity/scripts.inc"
+	.include "data/maps/LilycoveCity/scripts.inc"
+	.include "data/maps/MossdeepCity/scripts.inc"
+	.include "data/maps/SootopolisCity/scripts.inc"
+	.include "data/maps/EverGrandeCity/scripts.inc"
+	.include "data/maps/LittlerootTown/scripts.inc"
+	.include "data/maps/OldaleTown/scripts.inc"
+	.include "data/maps/DewfordTown/scripts.inc"
+	.include "data/maps/LavaridgeTown/scripts.inc"
+	.include "data/maps/FallarborTown/scripts.inc"
+	.include "data/maps/VerdanturfTown/scripts.inc"
+	.include "data/maps/PacifidlogTown/scripts.inc"
+	.include "data/maps/Route101/scripts.inc"
+	.include "data/maps/Route102/scripts.inc"
+	.include "data/maps/Route103/scripts.inc"
+	.include "data/maps/Route104/scripts.inc"
+	.include "data/maps/Route105/scripts.inc"
+	.include "data/maps/Route106/scripts.inc"
+	.include "data/maps/Route107/scripts.inc"
+	.include "data/maps/Route108/scripts.inc"
+	.include "data/maps/Route109/scripts.inc"
+	.include "data/maps/Route110/scripts.inc"
+	.include "data/maps/Route111/scripts.inc"
+	.include "data/maps/Route112/scripts.inc"
+	.include "data/maps/Route113/scripts.inc"
+	.include "data/maps/Route114/scripts.inc"
+	.include "data/maps/Route115/scripts.inc"
+	.include "data/maps/Route116/scripts.inc"
+	.include "data/maps/Route117/scripts.inc"
+	.include "data/maps/Route118/scripts.inc"
+	.include "data/maps/Route119/scripts.inc"
+	.include "data/maps/Route120/scripts.inc"
+	.include "data/maps/Route121/scripts.inc"
+	.include "data/maps/Route122/scripts.inc"
+	.include "data/maps/Route123/scripts.inc"
+	.include "data/maps/Route124/scripts.inc"
+	.include "data/maps/Route125/scripts.inc"
+	.include "data/maps/Route126/scripts.inc"
+	.include "data/maps/Route127/scripts.inc"
+	.include "data/maps/Route128/scripts.inc"
+	.include "data/maps/Route129/scripts.inc"
+	.include "data/maps/Route130/scripts.inc"
+	.include "data/maps/Route131/scripts.inc"
+	.include "data/maps/Route132/scripts.inc"
+	.include "data/maps/Route133/scripts.inc"
+	.include "data/maps/Route134/scripts.inc"
+	.include "data/maps/Underwater1/scripts.inc"
+	.include "data/maps/Underwater2/scripts.inc"
+	.include "data/maps/Underwater3/scripts.inc"
+	.include "data/maps/Underwater4/scripts.inc"
+	.include "data/maps/Underwater5/scripts.inc"
+	.include "data/maps/Underwater6/scripts.inc"
+	.include "data/maps/Underwater7/scripts.inc"
+	.include "data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc"
+	.include "data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc"
+	.include "data/maps/LittlerootTown_MaysHouse_1F/scripts.inc"
+	.include "data/maps/LittlerootTown_MaysHouse_2F/scripts.inc"
+	.include "data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc"
+	.include "data/maps/OldaleTown_House1/scripts.inc"
+	.include "data/maps/OldaleTown_House2/scripts.inc"
+	.include "data/maps/OldaleTown_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/OldaleTown_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/OldaleTown_Mart/scripts.inc"
+	.include "data/maps/DewfordTown_House1/scripts.inc"
+	.include "data/maps/DewfordTown_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/DewfordTown_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/DewfordTown_Gym/scripts.inc"
+	.include "data/maps/DewfordTown_Hall/scripts.inc"
+	.include "data/maps/DewfordTown_House2/scripts.inc"
+	.include "data/maps/LavaridgeTown_HerbShop/scripts.inc"
+	.include "data/maps/LavaridgeTown_Gym_1F/scripts.inc"
+	.include "data/maps/LavaridgeTown_Gym_B1F/scripts.inc"
+	.include "data/maps/LavaridgeTown_House/scripts.inc"
+	.include "data/maps/LavaridgeTown_Mart/scripts.inc"
+	.include "data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/FallarborTown_Mart/scripts.inc"
+	.include "data/maps/FallarborTown_BattleTentLobby/scripts.inc"
+	.include "data/maps/FallarborTown_BattleTentCorridor/scripts.inc"
+	.include "data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc"
+	.include "data/maps/FallarborTown_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/FallarborTown_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/FallarborTown_House1/scripts.inc"
+	.include "data/maps/FallarborTown_House2/scripts.inc"
+	.include "data/maps/VerdanturfTown_BattleTentLobby/scripts.inc"
+	.include "data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc"
+	.include "data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc"
+	.include "data/maps/VerdanturfTown_Mart/scripts.inc"
+	.include "data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/VerdanturfTown_WandasHouse/scripts.inc"
+	.include "data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc"
+	.include "data/maps/VerdanturfTown_House/scripts.inc"
+	.include "data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/PacifidlogTown_House1/scripts.inc"
+	.include "data/maps/PacifidlogTown_House2/scripts.inc"
+	.include "data/maps/PacifidlogTown_House3/scripts.inc"
+	.include "data/maps/PacifidlogTown_House4/scripts.inc"
+	.include "data/maps/PacifidlogTown_House5/scripts.inc"
+	.include "data/maps/PetalburgCity_WallysHouse/scripts.inc"
+	.include "data/maps/PetalburgCity_Gym/scripts.inc"
+	.include "data/maps/PetalburgCity_House1/scripts.inc"
+	.include "data/maps/PetalburgCity_House2/scripts.inc"
+	.include "data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/PetalburgCity_Mart/scripts.inc"
+	.include "data/maps/SlateportCity_SternsShipyard_1F/scripts.inc"
+	.include "data/maps/SlateportCity_SternsShipyard_2F/scripts.inc"
+	.include "data/maps/SlateportCity_BattleTentLobby/scripts.inc"
+	.include "data/maps/SlateportCity_BattleTentCorridor/scripts.inc"
+	.include "data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc"
+	.include "data/maps/SlateportCity_House1/scripts.inc"
+	.include "data/maps/SlateportCity_PokemonFanClub/scripts.inc"
+	.include "data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc"
+	.include "data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc"
+	.include "data/maps/SlateportCity_Harbor/scripts.inc"
+	.include "data/maps/SlateportCity_House2/scripts.inc"
+	.include "data/maps/SlateportCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/SlateportCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/SlateportCity_Mart/scripts.inc"
+	.include "data/maps/MauvilleCity_Gym/scripts.inc"
+	.include "data/maps/MauvilleCity_BikeShop/scripts.inc"
+	.include "data/maps/MauvilleCity_House1/scripts.inc"
+	.include "data/maps/MauvilleCity_GameCorner/scripts.inc"
+	.include "data/maps/MauvilleCity_House2/scripts.inc"
+	.include "data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/MauvilleCity_Mart/scripts.inc"
+	.include "data/maps/RustboroCity_DevonCorp_1F/scripts.inc"
+	.include "data/maps/RustboroCity_DevonCorp_2F/scripts.inc"
+	.include "data/maps/RustboroCity_DevonCorp_3F/scripts.inc"
+	.include "data/maps/RustboroCity_Gym/scripts.inc"
+	.include "data/maps/RustboroCity_PokemonSchool/scripts.inc"
+	.include "data/maps/RustboroCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/RustboroCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/RustboroCity_Mart/scripts.inc"
+	.include "data/maps/RustboroCity_Flat1_1F/scripts.inc"
+	.include "data/maps/RustboroCity_Flat1_2F/scripts.inc"
+	.include "data/maps/RustboroCity_House1/scripts.inc"
+	.include "data/maps/RustboroCity_CuttersHouse/scripts.inc"
+	.include "data/maps/RustboroCity_House2/scripts.inc"
+	.include "data/maps/RustboroCity_Flat2_1F/scripts.inc"
+	.include "data/maps/RustboroCity_Flat2_2F/scripts.inc"
+	.include "data/maps/RustboroCity_Flat2_3F/scripts.inc"
+	.include "data/maps/RustboroCity_House3/scripts.inc"
+	.include "data/maps/FortreeCity_House1/scripts.inc"
+	.include "data/maps/FortreeCity_Gym/scripts.inc"
+	.include "data/maps/FortreeCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/FortreeCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/FortreeCity_Mart/scripts.inc"
+	.include "data/maps/FortreeCity_House2/scripts.inc"
+	.include "data/maps/FortreeCity_House3/scripts.inc"
+	.include "data/maps/FortreeCity_House4/scripts.inc"
+	.include "data/maps/FortreeCity_House5/scripts.inc"
+	.include "data/maps/FortreeCity_DecorationShop/scripts.inc"
+	.include "data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc"
+	.include "data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc"
+	.include "data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc"
+	.include "data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc"
+	.include "data/maps/LilycoveCity_ContestLobby/scripts.inc"
+	.include "data/maps/LilycoveCity_ContestHall/scripts.inc"
+	.include "data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/LilycoveCity_UnusedMart/scripts.inc"
+	.include "data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc"
+	.include "data/maps/LilycoveCity_Harbor/scripts.inc"
+	.include "data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc"
+	.include "data/maps/LilycoveCity_House1/scripts.inc"
+	.include "data/maps/LilycoveCity_House2/scripts.inc"
+	.include "data/maps/LilycoveCity_House3/scripts.inc"
+	.include "data/maps/LilycoveCity_House4/scripts.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc"
+	.include "data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc"
+	.include "data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc"
+	.include "data/maps/MossdeepCity_Gym/scripts.inc"
+	.include "data/maps/MossdeepCity_House1/scripts.inc"
+	.include "data/maps/MossdeepCity_House2/scripts.inc"
+	.include "data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/MossdeepCity_Mart/scripts.inc"
+	.include "data/maps/MossdeepCity_House3/scripts.inc"
+	.include "data/maps/MossdeepCity_StevensHouse/scripts.inc"
+	.include "data/maps/MossdeepCity_House4/scripts.inc"
+	.include "data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc"
+	.include "data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc"
+	.include "data/maps/MossdeepCity_GameCorner_1F/scripts.inc"
+	.include "data/maps/MossdeepCity_GameCorner_B1F/scripts.inc"
+	.include "data/maps/SootopolisCity_Gym_1F/scripts.inc"
+	.include "data/maps/SootopolisCity_Gym_B1F/scripts.inc"
+	.include "data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/SootopolisCity_Mart/scripts.inc"
+	.include "data/maps/SootopolisCity_House1/scripts.inc"
+	.include "data/maps/SootopolisCity_House2/scripts.inc"
+	.include "data/maps/SootopolisCity_House3/scripts.inc"
+	.include "data/maps/SootopolisCity_House4/scripts.inc"
+	.include "data/maps/SootopolisCity_House5/scripts.inc"
+	.include "data/maps/SootopolisCity_House6/scripts.inc"
+	.include "data/maps/SootopolisCity_House7/scripts.inc"
+	.include "data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc"
+	.include "data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc"
+	.include "data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc"
+	.include "data/maps/EverGrandeCity_SidneysRoom/scripts.inc"
+	.include "data/maps/EverGrandeCity_PhoebesRoom/scripts.inc"
+	.include "data/maps/EverGrandeCity_GlaciasRoom/scripts.inc"
+	.include "data/maps/EverGrandeCity_DrakesRoom/scripts.inc"
+	.include "data/maps/EverGrandeCity_ChampionsRoom/scripts.inc"
+	.include "data/maps/EverGrandeCity_Hall1/scripts.inc"
+	.include "data/maps/EverGrandeCity_Hall2/scripts.inc"
+	.include "data/maps/EverGrandeCity_Hall3/scripts.inc"
+	.include "data/maps/EverGrandeCity_Hall4/scripts.inc"
+	.include "data/maps/EverGrandeCity_Hall5/scripts.inc"
+	.include "data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc"
+	.include "data/maps/EverGrandeCity_HallOfFame/scripts.inc"
+	.include "data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc"
+	.include "data/maps/Route104_MrBrineysHouse/scripts.inc"
+	.include "data/maps/Route104_PrettyPetalFlowerShop/scripts.inc"
+	.include "data/maps/Route111_WinstrateFamilysHouse/scripts.inc"
+	.include "data/maps/Route111_OldLadysRestStop/scripts.inc"
+	.include "data/maps/Route112_CableCarStation/scripts.inc"
+	.include "data/maps/MtChimney_CableCarStation/scripts.inc"
+	.include "data/maps/Route114_FossilManiacsHouse/scripts.inc"
+	.include "data/maps/Route114_FossilManiacsTunnel/scripts.inc"
+	.include "data/maps/Route114_LanettesHouse/scripts.inc"
+	.include "data/maps/Route116_TunnelersRestHouse/scripts.inc"
+	.include "data/maps/Route117_PokemonDayCare/scripts.inc"
+	.include "data/maps/Route121_SafariZoneEntrance/scripts.inc"
+	.include "data/maps/MeteorFalls_1F_1R/scripts.inc"
+	.include "data/maps/MeteorFalls_1F_2R/scripts.inc"
+	.include "data/maps/MeteorFalls_B1F_1R/scripts.inc"
+	.include "data/maps/MeteorFalls_B1F_2R/scripts.inc"
+	.include "data/maps/RusturfTunnel/scripts.inc"
+	.include "data/maps/Underwater_SootopolisCity/scripts.inc"
+	.include "data/maps/DesertRuins/scripts.inc"
+	.include "data/maps/GraniteCave_1F/scripts.inc"
+	.include "data/maps/GraniteCave_B1F/scripts.inc"
+	.include "data/maps/GraniteCave_B2F/scripts.inc"
+	.include "data/maps/GraniteCave_StevensRoom/scripts.inc"
+	.include "data/maps/PetalburgWoods/scripts.inc"
+	.include "data/maps/MtChimney/scripts.inc"
+	.include "data/maps/JaggedPass/scripts.inc"
+	.include "data/maps/FieryPath/scripts.inc"
+	.include "data/maps/MtPyre_1F/scripts.inc"
+	.include "data/maps/MtPyre_2F/scripts.inc"
+	.include "data/maps/MtPyre_3F/scripts.inc"
+	.include "data/maps/MtPyre_4F/scripts.inc"
+	.include "data/maps/MtPyre_5F/scripts.inc"
+	.include "data/maps/MtPyre_6F/scripts.inc"
+	.include "data/maps/MtPyre_Exterior/scripts.inc"
+	.include "data/maps/MtPyre_Summit/scripts.inc"
+	.include "data/maps/AquaHideout_1F/scripts.inc"
+	.include "data/maps/AquaHideout_B1F/scripts.inc"
+	.include "data/maps/AquaHideout_B2F/scripts.inc"
+	.include "data/maps/Underwater_SeafloorCavern/scripts.inc"
+	.include "data/maps/SeafloorCavern_Entrance/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room1/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room2/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room3/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room4/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room5/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room6/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room7/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room8/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room9/scripts.inc"
+	.include "data/maps/CaveOfOrigin_Entrance/scripts.inc"
+	.include "data/maps/CaveOfOrigin_1F/scripts.inc"
+	.include "data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc"
+	.include "data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc"
+	.include "data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc"
+	.include "data/maps/CaveOfOrigin_B1F/scripts.inc"
+	.include "data/maps/VictoryRoad_1F/scripts.inc"
+	.include "data/maps/VictoryRoad_B1F/scripts.inc"
+	.include "data/maps/VictoryRoad_B2F/scripts.inc"
+	.include "data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc"
+	.include "data/maps/ShoalCave_LowTideInnerRoom/scripts.inc"
+	.include "data/maps/ShoalCave_LowTideStairsRoom/scripts.inc"
+	.include "data/maps/ShoalCave_LowTideLowerRoom/scripts.inc"
+	.include "data/maps/ShoalCave_HighTideEntranceRoom/scripts.inc"
+	.include "data/maps/ShoalCave_HighTideInnerRoom/scripts.inc"
+	.include "data/maps/NewMauville_Entrance/scripts.inc"
+	.include "data/maps/NewMauville_Inside/scripts.inc"
+	.include "data/maps/AbandonedShip_Deck/scripts.inc"
+	.include "data/maps/AbandonedShip_Corridors_1F/scripts.inc"
+	.include "data/maps/AbandonedShip_Rooms_1F/scripts.inc"
+	.include "data/maps/AbandonedShip_Corridors_B1F/scripts.inc"
+	.include "data/maps/AbandonedShip_Rooms_B1F/scripts.inc"
+	.include "data/maps/AbandonedShip_Rooms2_B1F/scripts.inc"
+	.include "data/maps/AbandonedShip_Underwater1/scripts.inc"
+	.include "data/maps/AbandonedShip_Room_B1F/scripts.inc"
+	.include "data/maps/AbandonedShip_Rooms2_1F/scripts.inc"
+	.include "data/maps/AbandonedShip_CaptainsOffice/scripts.inc"
+	.include "data/maps/AbandonedShip_Underwater2/scripts.inc"
+	.include "data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc"
+	.include "data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc"
+	.include "data/maps/IslandCave/scripts.inc"
+	.include "data/maps/AncientTomb/scripts.inc"
+	.include "data/maps/Underwater_Route134/scripts.inc"
+	.include "data/maps/Underwater_SealedChamber/scripts.inc"
+	.include "data/maps/SealedChamber_OuterRoom/scripts.inc"
+	.include "data/maps/SealedChamber_InnerRoom/scripts.inc"
+	.include "data/maps/ScorchedSlab/scripts.inc"
+	.include "data/maps/AquaHideout_UnusedRubyMap1/scripts.inc"
+	.include "data/maps/AquaHideout_UnusedRubyMap2/scripts.inc"
+	.include "data/maps/AquaHideout_UnusedRubyMap3/scripts.inc"
+	.include "data/maps/SkyPillar_Entrance/scripts.inc"
+	.include "data/maps/SkyPillar_Outside/scripts.inc"
+	.include "data/maps/SkyPillar_1F/scripts.inc"
+	.include "data/maps/SkyPillar_2F/scripts.inc"
+	.include "data/maps/SkyPillar_3F/scripts.inc"
+	.include "data/maps/SkyPillar_4F/scripts.inc"
+	.include "data/maps/ShoalCave_LowTideIceRoom/scripts.inc"
+	.include "data/maps/SkyPillar_5F/scripts.inc"
+	.include "data/maps/SkyPillar_Top/scripts.inc"
+	.include "data/maps/MagmaHideout_1F/scripts.inc"
+	.include "data/maps/MagmaHideout_2F_1R/scripts.inc"
+	.include "data/maps/MagmaHideout_2F_2R/scripts.inc"
+	.include "data/maps/MagmaHideout_3F_1R/scripts.inc"
+	.include "data/maps/MagmaHideout_3F_2R/scripts.inc"
+	.include "data/maps/MagmaHideout_4F/scripts.inc"
+	.include "data/maps/MagmaHideout_3F_3R/scripts.inc"
+	.include "data/maps/MagmaHideout_2F_3R/scripts.inc"
+	.include "data/maps/MirageTower_1F/scripts.inc"
+	.include "data/maps/MirageTower_2F/scripts.inc"
+	.include "data/maps/MirageTower_3F/scripts.inc"
+	.include "data/maps/MirageTower_4F/scripts.inc"
+	.include "data/maps/DesertUnderpass/scripts.inc"
+	.include "data/maps/ArtisanCave_B1F/scripts.inc"
+	.include "data/maps/ArtisanCave_1F/scripts.inc"
+	.include "data/maps/Underwater_MarineCave/scripts.inc"
+	.include "data/maps/MarineCave_Entrance/scripts.inc"
+	.include "data/maps/MarineCave_End/scripts.inc"
+	.include "data/maps/TerraCave_Entrance/scripts.inc"
+	.include "data/maps/TerraCave_End/scripts.inc"
+	.include "data/maps/AlteringCave/scripts.inc"
+	.include "data/maps/MeteorFalls_StevensCave/scripts.inc"
+	.include "data/maps/SecretBase_BlueCave1/scripts.inc"
+	.include "data/maps/SecretBase_BlueCave2/scripts.inc"
+	.include "data/maps/SecretBase_BlueCave3/scripts.inc"
+	.include "data/maps/SecretBase_BlueCave4/scripts.inc"
+	.include "data/maps/SecretBase_BrownCave1/scripts.inc"
+	.include "data/maps/SecretBase_BrownCave2/scripts.inc"
+	.include "data/maps/SecretBase_BrownCave3/scripts.inc"
+	.include "data/maps/SecretBase_BrownCave4/scripts.inc"
+	.include "data/maps/SecretBase_RedCave1/scripts.inc"
+	.include "data/maps/SecretBase_RedCave2/scripts.inc"
+	.include "data/maps/SecretBase_RedCave3/scripts.inc"
+	.include "data/maps/SecretBase_RedCave4/scripts.inc"
+	.include "data/maps/SecretBase_Shrub1/scripts.inc"
+	.include "data/maps/SecretBase_Shrub2/scripts.inc"
+	.include "data/maps/SecretBase_Shrub3/scripts.inc"
+	.include "data/maps/SecretBase_Shrub4/scripts.inc"
+	.include "data/maps/SecretBase_Tree1/scripts.inc"
+	.include "data/maps/SecretBase_Tree2/scripts.inc"
+	.include "data/maps/SecretBase_Tree3/scripts.inc"
+	.include "data/maps/SecretBase_Tree4/scripts.inc"
+	.include "data/maps/SecretBase_YellowCave1/scripts.inc"
+	.include "data/maps/SecretBase_YellowCave2/scripts.inc"
+	.include "data/maps/SecretBase_YellowCave3/scripts.inc"
+	.include "data/maps/SecretBase_YellowCave4/scripts.inc"
 
 gUnknown_0823B4BB:: @ 823B4BB
 	lockall
@@ -627,154 +627,154 @@ gText_23B73E:: @ 823B73E
 SecretBase_RedCave1_Text_23B759: @ 823B759
 	.string "Want to make your SECRET BASE here?$"
 
-	.include "data/scripts/maps/SingleBattleColosseum.inc"
-	.include "data/scripts/maps/TradeCenter.inc"
-	.include "data/scripts/maps/RecordCorner.inc"
-	.include "data/scripts/maps/DoubleBattleColosseum.inc"
-	.include "data/scripts/maps/LinkContestRoom1.inc"
-	.include "data/scripts/maps/LinkContestRoom2.inc"
-	.include "data/scripts/maps/LinkContestRoom3.inc"
-	.include "data/scripts/maps/LinkContestRoom4.inc"
-	.include "data/scripts/maps/LinkContestRoom5.inc"
-	.include "data/scripts/maps/LinkContestRoom6.inc"
-	.include "data/scripts/maps/UnknownMap_25_29.inc"
-	.include "data/scripts/maps/UnknownMap_25_30.inc"
-	.include "data/scripts/maps/UnknownMap_25_31.inc"
-	.include "data/scripts/maps/UnknownMap_25_32.inc"
-	.include "data/scripts/maps/UnknownMap_25_33.inc"
-	.include "data/scripts/maps/UnknownMap_25_34.inc"
-	.include "data/scripts/maps/InsideOfTruck.inc"
-	.include "data/scripts/maps/SSTidalCorridor.inc"
-	.include "data/scripts/maps/SSTidalLowerDeck.inc"
-	.include "data/scripts/maps/SSTidalRooms.inc"
-	.include "data/scripts/maps/BattlePyramidSquare01.inc"
-	.include "data/scripts/maps/BattlePyramidSquare02.inc"
-	.include "data/scripts/maps/BattlePyramidSquare03.inc"
-	.include "data/scripts/maps/BattlePyramidSquare04.inc"
-	.include "data/scripts/maps/BattlePyramidSquare05.inc"
-	.include "data/scripts/maps/BattlePyramidSquare06.inc"
-	.include "data/scripts/maps/BattlePyramidSquare07.inc"
-	.include "data/scripts/maps/BattlePyramidSquare08.inc"
-	.include "data/scripts/maps/BattlePyramidSquare09.inc"
-	.include "data/scripts/maps/BattlePyramidSquare10.inc"
-	.include "data/scripts/maps/BattlePyramidSquare11.inc"
-	.include "data/scripts/maps/BattlePyramidSquare12.inc"
-	.include "data/scripts/maps/BattlePyramidSquare13.inc"
-	.include "data/scripts/maps/BattlePyramidSquare14.inc"
-	.include "data/scripts/maps/BattlePyramidSquare15.inc"
-	.include "data/scripts/maps/BattlePyramidSquare16.inc"
-	.include "data/scripts/maps/UnionRoom.inc"
-	.include "data/scripts/maps/SafariZone_Northwest.inc"
-	.include "data/scripts/maps/SafariZone_North.inc"
-	.include "data/scripts/maps/SafariZone_Southwest.inc"
-	.include "data/scripts/maps/SafariZone_South.inc"
-	.include "data/scripts/maps/BattleFrontier_OutsideWest.inc"
-	.include "data/scripts/maps/BattleFrontier_BattleTowerLobby.inc"
-	.include "data/scripts/maps/BattleFrontier_BattleTowerElevator.inc"
-	.include "data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc"
-	.include "data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc"
-	.include "data/scripts/maps/SouthernIsland_Exterior.inc"
-	.include "data/scripts/maps/SouthernIsland_Interior.inc"
-	.include "data/scripts/maps/SafariZone_RestHouse.inc"
-	.include "data/scripts/maps/SafariZone_Northeast.inc"
-	.include "data/scripts/maps/SafariZone_Southeast.inc"
-	.include "data/scripts/maps/BattleFrontier_OutsideEast.inc"
-	.include "data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc"
-	.include "data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc"
-	.include "data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc"
-	.include "data/scripts/maps/BattleFrontier_BattleDomeLobby.inc"
-	.include "data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc"
-	.include "data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc"
-	.include "data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc"
-	.include "data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc"
-	.include "data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc"
-	.include "data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc"
-	.include "data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc"
-	.include "data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc"
-	.include "data/scripts/maps/BattleFrontier_BattlePyramidTop.inc"
-	.include "data/scripts/maps/BattleFrontier_BattleArenaLobby.inc"
-	.include "data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc"
-	.include "data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc"
-	.include "data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc"
-	.include "data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc"
-	.include "data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc"
-	.include "data/scripts/maps/BattleFrontier_BattlePikeLobby.inc"
-	.include "data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc"
-	.include "data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc"
-	.include "data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc"
-	.include "data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc"
-	.include "data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc"
-	.include "data/scripts/maps/BattleFrontier_RankingHall.inc"
-	.include "data/scripts/maps/BattleFrontier_Lounge1.inc"
-	.include "data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc"
-	.include "data/scripts/maps/BattleFrontier_Lounge2.inc"
-	.include "data/scripts/maps/BattleFrontier_Lounge3.inc"
-	.include "data/scripts/maps/BattleFrontier_Lounge4.inc"
-	.include "data/scripts/maps/BattleFrontier_ScottsHouse.inc"
-	.include "data/scripts/maps/BattleFrontier_Lounge5.inc"
-	.include "data/scripts/maps/BattleFrontier_Lounge6.inc"
-	.include "data/scripts/maps/BattleFrontier_Lounge7.inc"
-	.include "data/scripts/maps/BattleFrontier_ReceptionGate.inc"
-	.include "data/scripts/maps/BattleFrontier_Lounge8.inc"
-	.include "data/scripts/maps/BattleFrontier_Lounge9.inc"
-	.include "data/scripts/maps/BattleFrontier_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/BattleFrontier_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/BattleFrontier_Mart.inc"
-	.include "data/scripts/maps/FarawayIsland_Entrance.inc"
-	.include "data/scripts/maps/FarawayIsland_Interior.inc"
-	.include "data/scripts/maps/BirthIsland_Exterior.inc"
-	.include "data/scripts/maps/BirthIsland_Harbor.inc"
-	.include "data/scripts/maps/TrainerHill_Entrance.inc"
-	.include "data/scripts/maps/TrainerHill_1F.inc"
-	.include "data/scripts/maps/TrainerHill_2F.inc"
-	.include "data/scripts/maps/TrainerHill_3F.inc"
-	.include "data/scripts/maps/TrainerHill_4F.inc"
-	.include "data/scripts/maps/TrainerHill_Roof.inc"
-	.include "data/scripts/maps/NavelRock_Exterior.inc"
-	.include "data/scripts/maps/NavelRock_Harbor.inc"
-	.include "data/scripts/maps/NavelRock_Entrance.inc"
-	.include "data/scripts/maps/NavelRock_B1F.inc"
-	.include "data/scripts/maps/NavelRock_Fork.inc"
-	.include "data/scripts/maps/NavelRock_Up1.inc"
-	.include "data/scripts/maps/NavelRock_Up2.inc"
-	.include "data/scripts/maps/NavelRock_Up3.inc"
-	.include "data/scripts/maps/NavelRock_Up4.inc"
-	.include "data/scripts/maps/NavelRock_Top.inc"
-	.include "data/scripts/maps/NavelRock_Down01.inc"
-	.include "data/scripts/maps/NavelRock_Down02.inc"
-	.include "data/scripts/maps/NavelRock_Down03.inc"
-	.include "data/scripts/maps/NavelRock_Down04.inc"
-	.include "data/scripts/maps/NavelRock_Down05.inc"
-	.include "data/scripts/maps/NavelRock_Down06.inc"
-	.include "data/scripts/maps/NavelRock_Down07.inc"
-	.include "data/scripts/maps/NavelRock_Down08.inc"
-	.include "data/scripts/maps/NavelRock_Down09.inc"
-	.include "data/scripts/maps/NavelRock_Down10.inc"
-	.include "data/scripts/maps/NavelRock_Down11.inc"
-	.include "data/scripts/maps/NavelRock_Bottom.inc"
-	.include "data/scripts/maps/TrainerHill_Elevator.inc"
-	.include "data/scripts/maps/Route104_Prototype.inc"
-	.include "data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.inc"
-	.include "data/scripts/maps/Route109_SeashoreHouse.inc"
-	.include "data/scripts/maps/Route110_TrickHouseEntrance.inc"
-	.include "data/scripts/maps/Route110_TrickHouseEnd.inc"
-	.include "data/scripts/maps/Route110_TrickHouseCorridor.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle1.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle2.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle3.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle4.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle5.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle6.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle7.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle8.inc"
-	.include "data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc"
-	.include "data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc"
-	.include "data/scripts/maps/Route113_GlassWorkshop.inc"
-	.include "data/scripts/maps/Route123_BerryMastersHouse.inc"
-	.include "data/scripts/maps/Route119_WeatherInstitute_1F.inc"
-	.include "data/scripts/maps/Route119_WeatherInstitute_2F.inc"
-	.include "data/scripts/maps/Route119_House.inc"
-	.include "data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc"
+	.include "data/maps/SingleBattleColosseum/scripts.inc"
+	.include "data/maps/TradeCenter/scripts.inc"
+	.include "data/maps/RecordCorner/scripts.inc"
+	.include "data/maps/DoubleBattleColosseum/scripts.inc"
+	.include "data/maps/LinkContestRoom1/scripts.inc"
+	.include "data/maps/LinkContestRoom2/scripts.inc"
+	.include "data/maps/LinkContestRoom3/scripts.inc"
+	.include "data/maps/LinkContestRoom4/scripts.inc"
+	.include "data/maps/LinkContestRoom5/scripts.inc"
+	.include "data/maps/LinkContestRoom6/scripts.inc"
+	.include "data/maps/UnknownMap_25_29/scripts.inc"
+	.include "data/maps/UnknownMap_25_30/scripts.inc"
+	.include "data/maps/UnknownMap_25_31/scripts.inc"
+	.include "data/maps/UnknownMap_25_32/scripts.inc"
+	.include "data/maps/UnknownMap_25_33/scripts.inc"
+	.include "data/maps/UnknownMap_25_34/scripts.inc"
+	.include "data/maps/InsideOfTruck/scripts.inc"
+	.include "data/maps/SSTidalCorridor/scripts.inc"
+	.include "data/maps/SSTidalLowerDeck/scripts.inc"
+	.include "data/maps/SSTidalRooms/scripts.inc"
+	.include "data/maps/BattlePyramidSquare01/scripts.inc"
+	.include "data/maps/BattlePyramidSquare02/scripts.inc"
+	.include "data/maps/BattlePyramidSquare03/scripts.inc"
+	.include "data/maps/BattlePyramidSquare04/scripts.inc"
+	.include "data/maps/BattlePyramidSquare05/scripts.inc"
+	.include "data/maps/BattlePyramidSquare06/scripts.inc"
+	.include "data/maps/BattlePyramidSquare07/scripts.inc"
+	.include "data/maps/BattlePyramidSquare08/scripts.inc"
+	.include "data/maps/BattlePyramidSquare09/scripts.inc"
+	.include "data/maps/BattlePyramidSquare10/scripts.inc"
+	.include "data/maps/BattlePyramidSquare11/scripts.inc"
+	.include "data/maps/BattlePyramidSquare12/scripts.inc"
+	.include "data/maps/BattlePyramidSquare13/scripts.inc"
+	.include "data/maps/BattlePyramidSquare14/scripts.inc"
+	.include "data/maps/BattlePyramidSquare15/scripts.inc"
+	.include "data/maps/BattlePyramidSquare16/scripts.inc"
+	.include "data/maps/UnionRoom/scripts.inc"
+	.include "data/maps/SafariZone_Northwest/scripts.inc"
+	.include "data/maps/SafariZone_North/scripts.inc"
+	.include "data/maps/SafariZone_Southwest/scripts.inc"
+	.include "data/maps/SafariZone_South/scripts.inc"
+	.include "data/maps/BattleFrontier_OutsideWest/scripts.inc"
+	.include "data/maps/BattleFrontier_BattleTowerLobby/scripts.inc"
+	.include "data/maps/BattleFrontier_BattleTowerElevator/scripts.inc"
+	.include "data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc"
+	.include "data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc"
+	.include "data/maps/SouthernIsland_Exterior/scripts.inc"
+	.include "data/maps/SouthernIsland_Interior/scripts.inc"
+	.include "data/maps/SafariZone_RestHouse/scripts.inc"
+	.include "data/maps/SafariZone_Northeast/scripts.inc"
+	.include "data/maps/SafariZone_Southeast/scripts.inc"
+	.include "data/maps/BattleFrontier_OutsideEast/scripts.inc"
+	.include "data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc"
+	.include "data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc"
+	.include "data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc"
+	.include "data/maps/BattleFrontier_BattleDomeLobby/scripts.inc"
+	.include "data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc"
+	.include "data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc"
+	.include "data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc"
+	.include "data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc"
+	.include "data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc"
+	.include "data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc"
+	.include "data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc"
+	.include "data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc"
+	.include "data/maps/BattleFrontier_BattlePyramidTop/scripts.inc"
+	.include "data/maps/BattleFrontier_BattleArenaLobby/scripts.inc"
+	.include "data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc"
+	.include "data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc"
+	.include "data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc"
+	.include "data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc"
+	.include "data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc"
+	.include "data/maps/BattleFrontier_BattlePikeLobby/scripts.inc"
+	.include "data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc"
+	.include "data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc"
+	.include "data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc"
+	.include "data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc"
+	.include "data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc"
+	.include "data/maps/BattleFrontier_RankingHall/scripts.inc"
+	.include "data/maps/BattleFrontier_Lounge1/scripts.inc"
+	.include "data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc"
+	.include "data/maps/BattleFrontier_Lounge2/scripts.inc"
+	.include "data/maps/BattleFrontier_Lounge3/scripts.inc"
+	.include "data/maps/BattleFrontier_Lounge4/scripts.inc"
+	.include "data/maps/BattleFrontier_ScottsHouse/scripts.inc"
+	.include "data/maps/BattleFrontier_Lounge5/scripts.inc"
+	.include "data/maps/BattleFrontier_Lounge6/scripts.inc"
+	.include "data/maps/BattleFrontier_Lounge7/scripts.inc"
+	.include "data/maps/BattleFrontier_ReceptionGate/scripts.inc"
+	.include "data/maps/BattleFrontier_Lounge8/scripts.inc"
+	.include "data/maps/BattleFrontier_Lounge9/scripts.inc"
+	.include "data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/BattleFrontier_Mart/scripts.inc"
+	.include "data/maps/FarawayIsland_Entrance/scripts.inc"
+	.include "data/maps/FarawayIsland_Interior/scripts.inc"
+	.include "data/maps/BirthIsland_Exterior/scripts.inc"
+	.include "data/maps/BirthIsland_Harbor/scripts.inc"
+	.include "data/maps/TrainerHill_Entrance/scripts.inc"
+	.include "data/maps/TrainerHill_1F/scripts.inc"
+	.include "data/maps/TrainerHill_2F/scripts.inc"
+	.include "data/maps/TrainerHill_3F/scripts.inc"
+	.include "data/maps/TrainerHill_4F/scripts.inc"
+	.include "data/maps/TrainerHill_Roof/scripts.inc"
+	.include "data/maps/NavelRock_Exterior/scripts.inc"
+	.include "data/maps/NavelRock_Harbor/scripts.inc"
+	.include "data/maps/NavelRock_Entrance/scripts.inc"
+	.include "data/maps/NavelRock_B1F/scripts.inc"
+	.include "data/maps/NavelRock_Fork/scripts.inc"
+	.include "data/maps/NavelRock_Up1/scripts.inc"
+	.include "data/maps/NavelRock_Up2/scripts.inc"
+	.include "data/maps/NavelRock_Up3/scripts.inc"
+	.include "data/maps/NavelRock_Up4/scripts.inc"
+	.include "data/maps/NavelRock_Top/scripts.inc"
+	.include "data/maps/NavelRock_Down01/scripts.inc"
+	.include "data/maps/NavelRock_Down02/scripts.inc"
+	.include "data/maps/NavelRock_Down03/scripts.inc"
+	.include "data/maps/NavelRock_Down04/scripts.inc"
+	.include "data/maps/NavelRock_Down05/scripts.inc"
+	.include "data/maps/NavelRock_Down06/scripts.inc"
+	.include "data/maps/NavelRock_Down07/scripts.inc"
+	.include "data/maps/NavelRock_Down08/scripts.inc"
+	.include "data/maps/NavelRock_Down09/scripts.inc"
+	.include "data/maps/NavelRock_Down10/scripts.inc"
+	.include "data/maps/NavelRock_Down11/scripts.inc"
+	.include "data/maps/NavelRock_Bottom/scripts.inc"
+	.include "data/maps/TrainerHill_Elevator/scripts.inc"
+	.include "data/maps/Route104_Prototype/scripts.inc"
+	.include "data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc"
+	.include "data/maps/Route109_SeashoreHouse/scripts.inc"
+	.include "data/maps/Route110_TrickHouseEntrance/scripts.inc"
+	.include "data/maps/Route110_TrickHouseEnd/scripts.inc"
+	.include "data/maps/Route110_TrickHouseCorridor/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle1/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle2/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle3/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle4/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle5/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle6/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle7/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle8/scripts.inc"
+	.include "data/maps/Route110_SeasideCyclingRoadEntrance1/scripts.inc"
+	.include "data/maps/Route110_SeasideCyclingRoadEntrance2/scripts.inc"
+	.include "data/maps/Route113_GlassWorkshop/scripts.inc"
+	.include "data/maps/Route123_BerryMastersHouse/scripts.inc"
+	.include "data/maps/Route119_WeatherInstitute_1F/scripts.inc"
+	.include "data/maps/Route119_WeatherInstitute_2F/scripts.inc"
+	.include "data/maps/Route119_House/scripts.inc"
+	.include "data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc"
 
 Std_2: @ 8271315
 	lock
diff --git a/data/map_events.s b/data/map_events.s
index 31b4b00d2..aca9978e4 100644
--- a/data/map_events.s
+++ b/data/map_events.s
@@ -8,522 +8,522 @@
 
 	.section .rodata
 
-	.include "data/maps/events/PetalburgCity.inc"
-	.include "data/maps/events/SlateportCity.inc"
-	.include "data/maps/events/MauvilleCity.inc"
-	.include "data/maps/events/RustboroCity.inc"
-	.include "data/maps/events/FortreeCity.inc"
-	.include "data/maps/events/LilycoveCity.inc"
-	.include "data/maps/events/MossdeepCity.inc"
-	.include "data/maps/events/SootopolisCity.inc"
-	.include "data/maps/events/EverGrandeCity.inc"
-	.include "data/maps/events/LittlerootTown.inc"
-	.include "data/maps/events/OldaleTown.inc"
-	.include "data/maps/events/DewfordTown.inc"
-	.include "data/maps/events/LavaridgeTown.inc"
-	.include "data/maps/events/FallarborTown.inc"
-	.include "data/maps/events/VerdanturfTown.inc"
-	.include "data/maps/events/PacifidlogTown.inc"
-	.include "data/maps/events/Route101.inc"
-	.include "data/maps/events/Route102.inc"
-	.include "data/maps/events/Route103.inc"
-	.include "data/maps/events/Route104.inc"
-	.include "data/maps/events/Route105.inc"
-	.include "data/maps/events/Route106.inc"
-	.include "data/maps/events/Route107.inc"
-	.include "data/maps/events/Route108.inc"
-	.include "data/maps/events/Route109.inc"
-	.include "data/maps/events/Route110.inc"
-	.include "data/maps/events/Route111.inc"
-	.include "data/maps/events/Route112.inc"
-	.include "data/maps/events/Route113.inc"
-	.include "data/maps/events/Route114.inc"
-	.include "data/maps/events/Route115.inc"
-	.include "data/maps/events/Route116.inc"
-	.include "data/maps/events/Route117.inc"
-	.include "data/maps/events/Route118.inc"
-	.include "data/maps/events/Route119.inc"
-	.include "data/maps/events/Route120.inc"
-	.include "data/maps/events/Route121.inc"
-	.include "data/maps/events/Route122.inc"
-	.include "data/maps/events/Route123.inc"
-	.include "data/maps/events/Route124.inc"
-	.include "data/maps/events/Route125.inc"
-	.include "data/maps/events/Route126.inc"
-	.include "data/maps/events/Route127.inc"
-	.include "data/maps/events/Route128.inc"
-	.include "data/maps/events/Route129.inc"
-	.include "data/maps/events/Route130.inc"
-	.include "data/maps/events/Route131.inc"
-	.include "data/maps/events/Route132.inc"
-	.include "data/maps/events/Route133.inc"
-	.include "data/maps/events/Route134.inc"
-	.include "data/maps/events/Underwater1.inc"
-	.include "data/maps/events/Underwater2.inc"
-	.include "data/maps/events/Underwater3.inc"
-	.include "data/maps/events/Underwater4.inc"
-	.include "data/maps/events/Underwater5.inc"
-	.include "data/maps/events/Underwater6.inc"
-	.include "data/maps/events/Underwater7.inc"
-	.include "data/maps/events/LittlerootTown_BrendansHouse_1F.inc"
-	.include "data/maps/events/LittlerootTown_BrendansHouse_2F.inc"
-	.include "data/maps/events/LittlerootTown_MaysHouse_1F.inc"
-	.include "data/maps/events/LittlerootTown_MaysHouse_2F.inc"
-	.include "data/maps/events/LittlerootTown_ProfessorBirchsLab.inc"
-	.include "data/maps/events/OldaleTown_House1.inc"
-	.include "data/maps/events/OldaleTown_House2.inc"
-	.include "data/maps/events/OldaleTown_PokemonCenter_1F.inc"
-	.include "data/maps/events/OldaleTown_PokemonCenter_2F.inc"
-	.include "data/maps/events/OldaleTown_Mart.inc"
-	.include "data/maps/events/DewfordTown_House1.inc"
-	.include "data/maps/events/DewfordTown_PokemonCenter_1F.inc"
-	.include "data/maps/events/DewfordTown_PokemonCenter_2F.inc"
-	.include "data/maps/events/DewfordTown_Gym.inc"
-	.include "data/maps/events/DewfordTown_Hall.inc"
-	.include "data/maps/events/DewfordTown_House2.inc"
-	.include "data/maps/events/LavaridgeTown_HerbShop.inc"
-	.include "data/maps/events/LavaridgeTown_Gym_1F.inc"
-	.include "data/maps/events/LavaridgeTown_Gym_B1F.inc"
-	.include "data/maps/events/LavaridgeTown_House.inc"
-	.include "data/maps/events/LavaridgeTown_Mart.inc"
-	.include "data/maps/events/LavaridgeTown_PokemonCenter_1F.inc"
-	.include "data/maps/events/LavaridgeTown_PokemonCenter_2F.inc"
-	.include "data/maps/events/FallarborTown_Mart.inc"
-	.include "data/maps/events/FallarborTown_BattleTentLobby.inc"
-	.include "data/maps/events/FallarborTown_BattleTentCorridor.inc"
-	.include "data/maps/events/FallarborTown_BattleTentBattleRoom.inc"
-	.include "data/maps/events/FallarborTown_PokemonCenter_1F.inc"
-	.include "data/maps/events/FallarborTown_PokemonCenter_2F.inc"
-	.include "data/maps/events/FallarborTown_House1.inc"
-	.include "data/maps/events/FallarborTown_House2.inc"
-	.include "data/maps/events/VerdanturfTown_BattleTentLobby.inc"
-	.include "data/maps/events/VerdanturfTown_BattleTentCorridor.inc"
-	.include "data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc"
-	.include "data/maps/events/VerdanturfTown_Mart.inc"
-	.include "data/maps/events/VerdanturfTown_PokemonCenter_1F.inc"
-	.include "data/maps/events/VerdanturfTown_PokemonCenter_2F.inc"
-	.include "data/maps/events/VerdanturfTown_WandasHouse.inc"
-	.include "data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc"
-	.include "data/maps/events/VerdanturfTown_House.inc"
-	.include "data/maps/events/PacifidlogTown_PokemonCenter_1F.inc"
-	.include "data/maps/events/PacifidlogTown_PokemonCenter_2F.inc"
-	.include "data/maps/events/PacifidlogTown_House1.inc"
-	.include "data/maps/events/PacifidlogTown_House2.inc"
-	.include "data/maps/events/PacifidlogTown_House3.inc"
-	.include "data/maps/events/PacifidlogTown_House4.inc"
-	.include "data/maps/events/PacifidlogTown_House5.inc"
-	.include "data/maps/events/PetalburgCity_WallysHouse.inc"
-	.include "data/maps/events/PetalburgCity_Gym.inc"
-	.include "data/maps/events/PetalburgCity_House1.inc"
-	.include "data/maps/events/PetalburgCity_House2.inc"
-	.include "data/maps/events/PetalburgCity_PokemonCenter_1F.inc"
-	.include "data/maps/events/PetalburgCity_PokemonCenter_2F.inc"
-	.include "data/maps/events/PetalburgCity_Mart.inc"
-	.include "data/maps/events/SlateportCity_SternsShipyard_1F.inc"
-	.include "data/maps/events/SlateportCity_SternsShipyard_2F.inc"
-	.include "data/maps/events/SlateportCity_BattleTentLobby.inc"
-	.include "data/maps/events/SlateportCity_BattleTentCorridor.inc"
-	.include "data/maps/events/SlateportCity_BattleTentBattleRoom.inc"
-	.include "data/maps/events/SlateportCity_House1.inc"
-	.include "data/maps/events/SlateportCity_PokemonFanClub.inc"
-	.include "data/maps/events/SlateportCity_OceanicMuseum_1F.inc"
-	.include "data/maps/events/SlateportCity_OceanicMuseum_2F.inc"
-	.include "data/maps/events/SlateportCity_Harbor.inc"
-	.include "data/maps/events/SlateportCity_House2.inc"
-	.include "data/maps/events/SlateportCity_PokemonCenter_1F.inc"
-	.include "data/maps/events/SlateportCity_PokemonCenter_2F.inc"
-	.include "data/maps/events/SlateportCity_Mart.inc"
-	.include "data/maps/events/MauvilleCity_Gym.inc"
-	.include "data/maps/events/MauvilleCity_BikeShop.inc"
-	.include "data/maps/events/MauvilleCity_House1.inc"
-	.include "data/maps/events/MauvilleCity_GameCorner.inc"
-	.include "data/maps/events/MauvilleCity_House2.inc"
-	.include "data/maps/events/MauvilleCity_PokemonCenter_1F.inc"
-	.include "data/maps/events/MauvilleCity_PokemonCenter_2F.inc"
-	.include "data/maps/events/MauvilleCity_Mart.inc"
-	.include "data/maps/events/RustboroCity_DevonCorp_1F.inc"
-	.include "data/maps/events/RustboroCity_DevonCorp_2F.inc"
-	.include "data/maps/events/RustboroCity_DevonCorp_3F.inc"
-	.include "data/maps/events/RustboroCity_Gym.inc"
-	.include "data/maps/events/RustboroCity_PokemonSchool.inc"
-	.include "data/maps/events/RustboroCity_PokemonCenter_1F.inc"
-	.include "data/maps/events/RustboroCity_PokemonCenter_2F.inc"
-	.include "data/maps/events/RustboroCity_Mart.inc"
-	.include "data/maps/events/RustboroCity_Flat1_1F.inc"
-	.include "data/maps/events/RustboroCity_Flat1_2F.inc"
-	.include "data/maps/events/RustboroCity_House1.inc"
-	.include "data/maps/events/RustboroCity_CuttersHouse.inc"
-	.include "data/maps/events/RustboroCity_House2.inc"
-	.include "data/maps/events/RustboroCity_Flat2_1F.inc"
-	.include "data/maps/events/RustboroCity_Flat2_2F.inc"
-	.include "data/maps/events/RustboroCity_Flat2_3F.inc"
-	.include "data/maps/events/RustboroCity_House3.inc"
-	.include "data/maps/events/FortreeCity_House1.inc"
-	.include "data/maps/events/FortreeCity_Gym.inc"
-	.include "data/maps/events/FortreeCity_PokemonCenter_1F.inc"
-	.include "data/maps/events/FortreeCity_PokemonCenter_2F.inc"
-	.include "data/maps/events/FortreeCity_Mart.inc"
-	.include "data/maps/events/FortreeCity_House2.inc"
-	.include "data/maps/events/FortreeCity_House3.inc"
-	.include "data/maps/events/FortreeCity_House4.inc"
-	.include "data/maps/events/FortreeCity_House5.inc"
-	.include "data/maps/events/FortreeCity_DecorationShop.inc"
-	.include "data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc"
-	.include "data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc"
-	.include "data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc"
-	.include "data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc"
-	.include "data/maps/events/LilycoveCity_ContestLobby.inc"
-	.include "data/maps/events/LilycoveCity_ContestHall.inc"
-	.include "data/maps/events/LilycoveCity_PokemonCenter_1F.inc"
-	.include "data/maps/events/LilycoveCity_PokemonCenter_2F.inc"
-	.include "data/maps/events/LilycoveCity_UnusedMart.inc"
-	.include "data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc"
-	.include "data/maps/events/LilycoveCity_Harbor.inc"
-	.include "data/maps/events/LilycoveCity_MoveDeletersHouse.inc"
-	.include "data/maps/events/LilycoveCity_House1.inc"
-	.include "data/maps/events/LilycoveCity_House2.inc"
-	.include "data/maps/events/LilycoveCity_House3.inc"
-	.include "data/maps/events/LilycoveCity_House4.inc"
-	.include "data/maps/events/LilycoveCity_DepartmentStore_1F.inc"
-	.include "data/maps/events/LilycoveCity_DepartmentStore_2F.inc"
-	.include "data/maps/events/LilycoveCity_DepartmentStore_3F.inc"
-	.include "data/maps/events/LilycoveCity_DepartmentStore_4F.inc"
-	.include "data/maps/events/LilycoveCity_DepartmentStore_5F.inc"
-	.include "data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc"
-	.include "data/maps/events/LilycoveCity_DepartmentStoreElevator.inc"
-	.include "data/maps/events/MossdeepCity_Gym.inc"
-	.include "data/maps/events/MossdeepCity_House1.inc"
-	.include "data/maps/events/MossdeepCity_House2.inc"
-	.include "data/maps/events/MossdeepCity_PokemonCenter_1F.inc"
-	.include "data/maps/events/MossdeepCity_PokemonCenter_2F.inc"
-	.include "data/maps/events/MossdeepCity_Mart.inc"
-	.include "data/maps/events/MossdeepCity_House3.inc"
-	.include "data/maps/events/MossdeepCity_StevensHouse.inc"
-	.include "data/maps/events/MossdeepCity_House4.inc"
-	.include "data/maps/events/MossdeepCity_SpaceCenter_1F.inc"
-	.include "data/maps/events/MossdeepCity_SpaceCenter_2F.inc"
-	.include "data/maps/events/MossdeepCity_GameCorner_1F.inc"
-	.include "data/maps/events/MossdeepCity_GameCorner_B1F.inc"
-	.include "data/maps/events/SootopolisCity_Gym_1F.inc"
-	.include "data/maps/events/SootopolisCity_Gym_B1F.inc"
-	.include "data/maps/events/SootopolisCity_PokemonCenter_1F.inc"
-	.include "data/maps/events/SootopolisCity_PokemonCenter_2F.inc"
-	.include "data/maps/events/SootopolisCity_Mart.inc"
-	.include "data/maps/events/SootopolisCity_House1.inc"
-	.include "data/maps/events/SootopolisCity_House2.inc"
-	.include "data/maps/events/SootopolisCity_House3.inc"
-	.include "data/maps/events/SootopolisCity_House4.inc"
-	.include "data/maps/events/SootopolisCity_House5.inc"
-	.include "data/maps/events/SootopolisCity_House6.inc"
-	.include "data/maps/events/SootopolisCity_House7.inc"
-	.include "data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc"
-	.include "data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc"
-	.include "data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc"
-	.include "data/maps/events/EverGrandeCity_SidneysRoom.inc"
-	.include "data/maps/events/EverGrandeCity_PhoebesRoom.inc"
-	.include "data/maps/events/EverGrandeCity_GlaciasRoom.inc"
-	.include "data/maps/events/EverGrandeCity_DrakesRoom.inc"
-	.include "data/maps/events/EverGrandeCity_ChampionsRoom.inc"
-	.include "data/maps/events/EverGrandeCity_Hall1.inc"
-	.include "data/maps/events/EverGrandeCity_Hall2.inc"
-	.include "data/maps/events/EverGrandeCity_Hall3.inc"
-	.include "data/maps/events/EverGrandeCity_Hall4.inc"
-	.include "data/maps/events/EverGrandeCity_Hall5.inc"
-	.include "data/maps/events/EverGrandeCity_PokemonLeague_1F.inc"
-	.include "data/maps/events/EverGrandeCity_HallOfFame.inc"
-	.include "data/maps/events/EverGrandeCity_PokemonCenter_1F.inc"
-	.include "data/maps/events/EverGrandeCity_PokemonCenter_2F.inc"
-	.include "data/maps/events/EverGrandeCity_PokemonLeague_2F.inc"
-	.include "data/maps/events/Route104_MrBrineysHouse.inc"
-	.include "data/maps/events/Route104_PrettyPetalFlowerShop.inc"
-	.include "data/maps/events/Route111_WinstrateFamilysHouse.inc"
-	.include "data/maps/events/Route111_OldLadysRestStop.inc"
-	.include "data/maps/events/Route112_CableCarStation.inc"
-	.include "data/maps/events/MtChimney_CableCarStation.inc"
-	.include "data/maps/events/Route114_FossilManiacsHouse.inc"
-	.include "data/maps/events/Route114_FossilManiacsTunnel.inc"
-	.include "data/maps/events/Route114_LanettesHouse.inc"
-	.include "data/maps/events/Route116_TunnelersRestHouse.inc"
-	.include "data/maps/events/Route117_PokemonDayCare.inc"
-	.include "data/maps/events/Route121_SafariZoneEntrance.inc"
-	.include "data/maps/events/MeteorFalls_1F_1R.inc"
-	.include "data/maps/events/MeteorFalls_1F_2R.inc"
-	.include "data/maps/events/MeteorFalls_B1F_1R.inc"
-	.include "data/maps/events/MeteorFalls_B1F_2R.inc"
-	.include "data/maps/events/RusturfTunnel.inc"
-	.include "data/maps/events/Underwater_SootopolisCity.inc"
-	.include "data/maps/events/DesertRuins.inc"
-	.include "data/maps/events/GraniteCave_1F.inc"
-	.include "data/maps/events/GraniteCave_B1F.inc"
-	.include "data/maps/events/GraniteCave_B2F.inc"
-	.include "data/maps/events/GraniteCave_StevensRoom.inc"
-	.include "data/maps/events/PetalburgWoods.inc"
-	.include "data/maps/events/MtChimney.inc"
-	.include "data/maps/events/JaggedPass.inc"
-	.include "data/maps/events/FieryPath.inc"
-	.include "data/maps/events/MtPyre_1F.inc"
-	.include "data/maps/events/MtPyre_2F.inc"
-	.include "data/maps/events/MtPyre_3F.inc"
-	.include "data/maps/events/MtPyre_4F.inc"
-	.include "data/maps/events/MtPyre_5F.inc"
-	.include "data/maps/events/MtPyre_6F.inc"
-	.include "data/maps/events/MtPyre_Exterior.inc"
-	.include "data/maps/events/MtPyre_Summit.inc"
-	.include "data/maps/events/AquaHideout_1F.inc"
-	.include "data/maps/events/AquaHideout_B1F.inc"
-	.include "data/maps/events/AquaHideout_B2F.inc"
-	.include "data/maps/events/Underwater_SeafloorCavern.inc"
-	.include "data/maps/events/SeafloorCavern_Entrance.inc"
-	.include "data/maps/events/SeafloorCavern_Room1.inc"
-	.include "data/maps/events/SeafloorCavern_Room2.inc"
-	.include "data/maps/events/SeafloorCavern_Room3.inc"
-	.include "data/maps/events/SeafloorCavern_Room4.inc"
-	.include "data/maps/events/SeafloorCavern_Room5.inc"
-	.include "data/maps/events/SeafloorCavern_Room6.inc"
-	.include "data/maps/events/SeafloorCavern_Room7.inc"
-	.include "data/maps/events/SeafloorCavern_Room8.inc"
-	.include "data/maps/events/SeafloorCavern_Room9.inc"
-	.include "data/maps/events/CaveOfOrigin_Entrance.inc"
-	.include "data/maps/events/CaveOfOrigin_1F.inc"
-	.include "data/maps/events/CaveOfOrigin_UnusedRubySapphireMap1.inc"
-	.include "data/maps/events/CaveOfOrigin_UnusedRubySapphireMap2.inc"
-	.include "data/maps/events/CaveOfOrigin_UnusedRubySapphireMap3.inc"
-	.include "data/maps/events/CaveOfOrigin_B1F.inc"
-	.include "data/maps/events/VictoryRoad_1F.inc"
-	.include "data/maps/events/VictoryRoad_B1F.inc"
-	.include "data/maps/events/VictoryRoad_B2F.inc"
-	.include "data/maps/events/ShoalCave_LowTideEntranceRoom.inc"
-	.include "data/maps/events/ShoalCave_LowTideInnerRoom.inc"
-	.include "data/maps/events/ShoalCave_LowTideStairsRoom.inc"
-	.include "data/maps/events/ShoalCave_LowTideLowerRoom.inc"
-	.include "data/maps/events/ShoalCave_HighTideEntranceRoom.inc"
-	.include "data/maps/events/ShoalCave_HighTideInnerRoom.inc"
-	.include "data/maps/events/NewMauville_Entrance.inc"
-	.include "data/maps/events/NewMauville_Inside.inc"
-	.include "data/maps/events/AbandonedShip_Deck.inc"
-	.include "data/maps/events/AbandonedShip_Corridors_1F.inc"
-	.include "data/maps/events/AbandonedShip_Rooms_1F.inc"
-	.include "data/maps/events/AbandonedShip_Corridors_B1F.inc"
-	.include "data/maps/events/AbandonedShip_Rooms_B1F.inc"
-	.include "data/maps/events/AbandonedShip_Rooms2_B1F.inc"
-	.include "data/maps/events/AbandonedShip_Underwater1.inc"
-	.include "data/maps/events/AbandonedShip_Room_B1F.inc"
-	.include "data/maps/events/AbandonedShip_Rooms2_1F.inc"
-	.include "data/maps/events/AbandonedShip_CaptainsOffice.inc"
-	.include "data/maps/events/AbandonedShip_Underwater2.inc"
-	.include "data/maps/events/AbandonedShip_HiddenFloorCorridors.inc"
-	.include "data/maps/events/AbandonedShip_HiddenFloorRooms.inc"
-	.include "data/maps/events/IslandCave.inc"
-	.include "data/maps/events/AncientTomb.inc"
-	.include "data/maps/events/Underwater_Route134.inc"
-	.include "data/maps/events/Underwater_SealedChamber.inc"
-	.include "data/maps/events/SealedChamber_OuterRoom.inc"
-	.include "data/maps/events/SealedChamber_InnerRoom.inc"
-	.include "data/maps/events/ScorchedSlab.inc"
-	.include "data/maps/events/AquaHideout_UnusedRubyMap1.inc"
-	.include "data/maps/events/AquaHideout_UnusedRubyMap2.inc"
-	.include "data/maps/events/AquaHideout_UnusedRubyMap3.inc"
-	.include "data/maps/events/SkyPillar_Entrance.inc"
-	.include "data/maps/events/SkyPillar_Outside.inc"
-	.include "data/maps/events/SkyPillar_1F.inc"
-	.include "data/maps/events/SkyPillar_2F.inc"
-	.include "data/maps/events/SkyPillar_3F.inc"
-	.include "data/maps/events/SkyPillar_4F.inc"
-	.include "data/maps/events/ShoalCave_LowTideIceRoom.inc"
-	.include "data/maps/events/SkyPillar_5F.inc"
-	.include "data/maps/events/SkyPillar_Top.inc"
-	.include "data/maps/events/MagmaHideout_1F.inc"
-	.include "data/maps/events/MagmaHideout_2F_1R.inc"
-	.include "data/maps/events/MagmaHideout_2F_2R.inc"
-	.include "data/maps/events/MagmaHideout_3F_1R.inc"
-	.include "data/maps/events/MagmaHideout_3F_2R.inc"
-	.include "data/maps/events/MagmaHideout_4F.inc"
-	.include "data/maps/events/MagmaHideout_3F_3R.inc"
-	.include "data/maps/events/MagmaHideout_2F_3R.inc"
-	.include "data/maps/events/MirageTower_1F.inc"
-	.include "data/maps/events/MirageTower_2F.inc"
-	.include "data/maps/events/MirageTower_3F.inc"
-	.include "data/maps/events/MirageTower_4F.inc"
-	.include "data/maps/events/DesertUnderpass.inc"
-	.include "data/maps/events/ArtisanCave_B1F.inc"
-	.include "data/maps/events/ArtisanCave_1F.inc"
-	.include "data/maps/events/Underwater_MarineCave.inc"
-	.include "data/maps/events/MarineCave_Entrance.inc"
-	.include "data/maps/events/MarineCave_End.inc"
-	.include "data/maps/events/TerraCave_Entrance.inc"
-	.include "data/maps/events/TerraCave_End.inc"
-	.include "data/maps/events/AlteringCave.inc"
-	.include "data/maps/events/MeteorFalls_StevensCave.inc"
-	.include "data/maps/events/SecretBase_RedCave1.inc"
-	.include "data/maps/events/SecretBase_BrownCave1.inc"
-	.include "data/maps/events/SecretBase_BlueCave1.inc"
-	.include "data/maps/events/SecretBase_YellowCave1.inc"
-	.include "data/maps/events/SecretBase_Tree1.inc"
-	.include "data/maps/events/SecretBase_Shrub1.inc"
-	.include "data/maps/events/SecretBase_RedCave2.inc"
-	.include "data/maps/events/SecretBase_BrownCave2.inc"
-	.include "data/maps/events/SecretBase_BlueCave2.inc"
-	.include "data/maps/events/SecretBase_YellowCave2.inc"
-	.include "data/maps/events/SecretBase_Tree2.inc"
-	.include "data/maps/events/SecretBase_Shrub2.inc"
-	.include "data/maps/events/SecretBase_RedCave3.inc"
-	.include "data/maps/events/SecretBase_BrownCave3.inc"
-	.include "data/maps/events/SecretBase_BlueCave3.inc"
-	.include "data/maps/events/SecretBase_YellowCave3.inc"
-	.include "data/maps/events/SecretBase_Tree3.inc"
-	.include "data/maps/events/SecretBase_Shrub3.inc"
-	.include "data/maps/events/SecretBase_RedCave4.inc"
-	.include "data/maps/events/SecretBase_BrownCave4.inc"
-	.include "data/maps/events/SecretBase_BlueCave4.inc"
-	.include "data/maps/events/SecretBase_YellowCave4.inc"
-	.include "data/maps/events/SecretBase_Tree4.inc"
-	.include "data/maps/events/SecretBase_Shrub4.inc"
-	.include "data/maps/events/SingleBattleColosseum.inc"
-	.include "data/maps/events/TradeCenter.inc"
-	.include "data/maps/events/RecordCorner.inc"
-	.include "data/maps/events/DoubleBattleColosseum.inc"
-	.include "data/maps/events/LinkContestRoom1.inc"
-	.include "data/maps/events/LinkContestRoom2.inc"
-	.include "data/maps/events/LinkContestRoom3.inc"
-	.include "data/maps/events/LinkContestRoom4.inc"
-	.include "data/maps/events/LinkContestRoom5.inc"
-	.include "data/maps/events/LinkContestRoom6.inc"
-	.include "data/maps/events/UnknownMap_25_29.inc"
-	.include "data/maps/events/UnknownMap_25_30.inc"
-	.include "data/maps/events/UnknownMap_25_31.inc"
-	.include "data/maps/events/UnknownMap_25_32.inc"
-	.include "data/maps/events/UnknownMap_25_33.inc"
-	.include "data/maps/events/UnknownMap_25_34.inc"
-	.include "data/maps/events/InsideOfTruck.inc"
-	.include "data/maps/events/SSTidalCorridor.inc"
-	.include "data/maps/events/SSTidalLowerDeck.inc"
-	.include "data/maps/events/SSTidalRooms.inc"
-	.include "data/maps/events/BattlePyramidSquare01.inc"
-	.include "data/maps/events/BattlePyramidSquare02.inc"
-	.include "data/maps/events/BattlePyramidSquare03.inc"
-	.include "data/maps/events/BattlePyramidSquare04.inc"
-	.include "data/maps/events/BattlePyramidSquare05.inc"
-	.include "data/maps/events/BattlePyramidSquare06.inc"
-	.include "data/maps/events/BattlePyramidSquare07.inc"
-	.include "data/maps/events/BattlePyramidSquare08.inc"
-	.include "data/maps/events/BattlePyramidSquare09.inc"
-	.include "data/maps/events/BattlePyramidSquare10.inc"
-	.include "data/maps/events/BattlePyramidSquare11.inc"
-	.include "data/maps/events/BattlePyramidSquare12.inc"
-	.include "data/maps/events/BattlePyramidSquare13.inc"
-	.include "data/maps/events/BattlePyramidSquare14.inc"
-	.include "data/maps/events/BattlePyramidSquare15.inc"
-	.include "data/maps/events/BattlePyramidSquare16.inc"
-	.include "data/maps/events/UnionRoom.inc"
-	.include "data/maps/events/SafariZone_Northwest.inc"
-	.include "data/maps/events/SafariZone_North.inc"
-	.include "data/maps/events/SafariZone_Southwest.inc"
-	.include "data/maps/events/SafariZone_South.inc"
-	.include "data/maps/events/BattleFrontier_OutsideWest.inc"
-	.include "data/maps/events/BattleFrontier_BattleTowerLobby.inc"
-	.include "data/maps/events/BattleFrontier_BattleTowerElevator.inc"
-	.include "data/maps/events/BattleFrontier_BattleTowerCorridor.inc"
-	.include "data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc"
-	.include "data/maps/events/SouthernIsland_Exterior.inc"
-	.include "data/maps/events/SouthernIsland_Interior.inc"
-	.include "data/maps/events/SafariZone_RestHouse.inc"
-	.include "data/maps/events/SafariZone_Northeast.inc"
-	.include "data/maps/events/SafariZone_Southeast.inc"
-	.include "data/maps/events/BattleFrontier_OutsideEast.inc"
-	.include "data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc"
-	.include "data/maps/events/BattleFrontier_BattleTowerCorridor2.inc"
-	.include "data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc"
-	.include "data/maps/events/BattleFrontier_BattleDomeLobby.inc"
-	.include "data/maps/events/BattleFrontier_BattleDomeCorridor.inc"
-	.include "data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc"
-	.include "data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc"
-	.include "data/maps/events/BattleFrontier_BattlePalaceLobby.inc"
-	.include "data/maps/events/BattleFrontier_BattlePalaceCorridor.inc"
-	.include "data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc"
-	.include "data/maps/events/BattleFrontier_BattlePyramidLobby.inc"
-	.include "data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc"
-	.include "data/maps/events/BattleFrontier_BattlePyramidTop.inc"
-	.include "data/maps/events/BattleFrontier_BattleArenaLobby.inc"
-	.include "data/maps/events/BattleFrontier_BattleArenaCorridor.inc"
-	.include "data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc"
-	.include "data/maps/events/BattleFrontier_BattleFactoryLobby.inc"
-	.include "data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc"
-	.include "data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc"
-	.include "data/maps/events/BattleFrontier_BattlePikeLobby.inc"
-	.include "data/maps/events/BattleFrontier_BattlePikeCorridor.inc"
-	.include "data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc"
-	.include "data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc"
-	.include "data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc"
-	.include "data/maps/events/BattleFrontier_BattlePikeRandomRoom3.inc"
-	.include "data/maps/events/BattleFrontier_RankingHall.inc"
-	.include "data/maps/events/BattleFrontier_Lounge1.inc"
-	.include "data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc"
-	.include "data/maps/events/BattleFrontier_Lounge2.inc"
-	.include "data/maps/events/BattleFrontier_Lounge3.inc"
-	.include "data/maps/events/BattleFrontier_Lounge4.inc"
-	.include "data/maps/events/BattleFrontier_ScottsHouse.inc"
-	.include "data/maps/events/BattleFrontier_Lounge5.inc"
-	.include "data/maps/events/BattleFrontier_Lounge6.inc"
-	.include "data/maps/events/BattleFrontier_Lounge7.inc"
-	.include "data/maps/events/BattleFrontier_ReceptionGate.inc"
-	.include "data/maps/events/BattleFrontier_Lounge8.inc"
-	.include "data/maps/events/BattleFrontier_Lounge9.inc"
-	.include "data/maps/events/BattleFrontier_PokemonCenter_1F.inc"
-	.include "data/maps/events/BattleFrontier_PokemonCenter_2F.inc"
-	.include "data/maps/events/BattleFrontier_Mart.inc"
-	.include "data/maps/events/FarawayIsland_Entrance.inc"
-	.include "data/maps/events/FarawayIsland_Interior.inc"
-	.include "data/maps/events/BirthIsland_Exterior.inc"
-	.include "data/maps/events/BirthIsland_Harbor.inc"
-	.include "data/maps/events/TrainerHill_Entrance.inc"
-	.include "data/maps/events/TrainerHill_1F.inc"
-	.include "data/maps/events/TrainerHill_2F.inc"
-	.include "data/maps/events/TrainerHill_3F.inc"
-	.include "data/maps/events/TrainerHill_4F.inc"
-	.include "data/maps/events/TrainerHill_Roof.inc"
-	.include "data/maps/events/NavelRock_Exterior.inc"
-	.include "data/maps/events/NavelRock_Harbor.inc"
-	.include "data/maps/events/NavelRock_Entrance.inc"
-	.include "data/maps/events/NavelRock_B1F.inc"
-	.include "data/maps/events/NavelRock_Fork.inc"
-	.include "data/maps/events/NavelRock_Up1.inc"
-	.include "data/maps/events/NavelRock_Up2.inc"
-	.include "data/maps/events/NavelRock_Up3.inc"
-	.include "data/maps/events/NavelRock_Up4.inc"
-	.include "data/maps/events/NavelRock_Top.inc"
-	.include "data/maps/events/NavelRock_Down01.inc"
-	.include "data/maps/events/NavelRock_Down02.inc"
-	.include "data/maps/events/NavelRock_Down03.inc"
-	.include "data/maps/events/NavelRock_Down04.inc"
-	.include "data/maps/events/NavelRock_Down05.inc"
-	.include "data/maps/events/NavelRock_Down06.inc"
-	.include "data/maps/events/NavelRock_Down07.inc"
-	.include "data/maps/events/NavelRock_Down08.inc"
-	.include "data/maps/events/NavelRock_Down09.inc"
-	.include "data/maps/events/NavelRock_Down10.inc"
-	.include "data/maps/events/NavelRock_Down11.inc"
-	.include "data/maps/events/NavelRock_Bottom.inc"
-	.include "data/maps/events/TrainerHill_Elevator.inc"
-	.include "data/maps/events/Route104_Prototype.inc"
-	.include "data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc"
-	.include "data/maps/events/Route109_SeashoreHouse.inc"
-	.include "data/maps/events/Route110_TrickHouseEntrance.inc"
-	.include "data/maps/events/Route110_TrickHouseEnd.inc"
-	.include "data/maps/events/Route110_TrickHouseCorridor.inc"
-	.include "data/maps/events/Route110_TrickHousePuzzle1.inc"
-	.include "data/maps/events/Route110_TrickHousePuzzle2.inc"
-	.include "data/maps/events/Route110_TrickHousePuzzle3.inc"
-	.include "data/maps/events/Route110_TrickHousePuzzle4.inc"
-	.include "data/maps/events/Route110_TrickHousePuzzle5.inc"
-	.include "data/maps/events/Route110_TrickHousePuzzle6.inc"
-	.include "data/maps/events/Route110_TrickHousePuzzle7.inc"
-	.include "data/maps/events/Route110_TrickHousePuzzle8.inc"
-	.include "data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc"
-	.include "data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc"
-	.include "data/maps/events/Route113_GlassWorkshop.inc"
-	.include "data/maps/events/Route123_BerryMastersHouse.inc"
-	.include "data/maps/events/Route119_WeatherInstitute_1F.inc"
-	.include "data/maps/events/Route119_WeatherInstitute_2F.inc"
-	.include "data/maps/events/Route119_House.inc"
-	.include "data/maps/events/Route124_DivingTreasureHuntersHouse.inc"
+	.include "data/maps/PetalburgCity/events.inc"
+	.include "data/maps/SlateportCity/events.inc"
+	.include "data/maps/MauvilleCity/events.inc"
+	.include "data/maps/RustboroCity/events.inc"
+	.include "data/maps/FortreeCity/events.inc"
+	.include "data/maps/LilycoveCity/events.inc"
+	.include "data/maps/MossdeepCity/events.inc"
+	.include "data/maps/SootopolisCity/events.inc"
+	.include "data/maps/EverGrandeCity/events.inc"
+	.include "data/maps/LittlerootTown/events.inc"
+	.include "data/maps/OldaleTown/events.inc"
+	.include "data/maps/DewfordTown/events.inc"
+	.include "data/maps/LavaridgeTown/events.inc"
+	.include "data/maps/FallarborTown/events.inc"
+	.include "data/maps/VerdanturfTown/events.inc"
+	.include "data/maps/PacifidlogTown/events.inc"
+	.include "data/maps/Route101/events.inc"
+	.include "data/maps/Route102/events.inc"
+	.include "data/maps/Route103/events.inc"
+	.include "data/maps/Route104/events.inc"
+	.include "data/maps/Route105/events.inc"
+	.include "data/maps/Route106/events.inc"
+	.include "data/maps/Route107/events.inc"
+	.include "data/maps/Route108/events.inc"
+	.include "data/maps/Route109/events.inc"
+	.include "data/maps/Route110/events.inc"
+	.include "data/maps/Route111/events.inc"
+	.include "data/maps/Route112/events.inc"
+	.include "data/maps/Route113/events.inc"
+	.include "data/maps/Route114/events.inc"
+	.include "data/maps/Route115/events.inc"
+	.include "data/maps/Route116/events.inc"
+	.include "data/maps/Route117/events.inc"
+	.include "data/maps/Route118/events.inc"
+	.include "data/maps/Route119/events.inc"
+	.include "data/maps/Route120/events.inc"
+	.include "data/maps/Route121/events.inc"
+	.include "data/maps/Route122/events.inc"
+	.include "data/maps/Route123/events.inc"
+	.include "data/maps/Route124/events.inc"
+	.include "data/maps/Route125/events.inc"
+	.include "data/maps/Route126/events.inc"
+	.include "data/maps/Route127/events.inc"
+	.include "data/maps/Route128/events.inc"
+	.include "data/maps/Route129/events.inc"
+	.include "data/maps/Route130/events.inc"
+	.include "data/maps/Route131/events.inc"
+	.include "data/maps/Route132/events.inc"
+	.include "data/maps/Route133/events.inc"
+	.include "data/maps/Route134/events.inc"
+	.include "data/maps/Underwater1/events.inc"
+	.include "data/maps/Underwater2/events.inc"
+	.include "data/maps/Underwater3/events.inc"
+	.include "data/maps/Underwater4/events.inc"
+	.include "data/maps/Underwater5/events.inc"
+	.include "data/maps/Underwater6/events.inc"
+	.include "data/maps/Underwater7/events.inc"
+	.include "data/maps/LittlerootTown_BrendansHouse_1F/events.inc"
+	.include "data/maps/LittlerootTown_BrendansHouse_2F/events.inc"
+	.include "data/maps/LittlerootTown_MaysHouse_1F/events.inc"
+	.include "data/maps/LittlerootTown_MaysHouse_2F/events.inc"
+	.include "data/maps/LittlerootTown_ProfessorBirchsLab/events.inc"
+	.include "data/maps/OldaleTown_House1/events.inc"
+	.include "data/maps/OldaleTown_House2/events.inc"
+	.include "data/maps/OldaleTown_PokemonCenter_1F/events.inc"
+	.include "data/maps/OldaleTown_PokemonCenter_2F/events.inc"
+	.include "data/maps/OldaleTown_Mart/events.inc"
+	.include "data/maps/DewfordTown_House1/events.inc"
+	.include "data/maps/DewfordTown_PokemonCenter_1F/events.inc"
+	.include "data/maps/DewfordTown_PokemonCenter_2F/events.inc"
+	.include "data/maps/DewfordTown_Gym/events.inc"
+	.include "data/maps/DewfordTown_Hall/events.inc"
+	.include "data/maps/DewfordTown_House2/events.inc"
+	.include "data/maps/LavaridgeTown_HerbShop/events.inc"
+	.include "data/maps/LavaridgeTown_Gym_1F/events.inc"
+	.include "data/maps/LavaridgeTown_Gym_B1F/events.inc"
+	.include "data/maps/LavaridgeTown_House/events.inc"
+	.include "data/maps/LavaridgeTown_Mart/events.inc"
+	.include "data/maps/LavaridgeTown_PokemonCenter_1F/events.inc"
+	.include "data/maps/LavaridgeTown_PokemonCenter_2F/events.inc"
+	.include "data/maps/FallarborTown_Mart/events.inc"
+	.include "data/maps/FallarborTown_BattleTentLobby/events.inc"
+	.include "data/maps/FallarborTown_BattleTentCorridor/events.inc"
+	.include "data/maps/FallarborTown_BattleTentBattleRoom/events.inc"
+	.include "data/maps/FallarborTown_PokemonCenter_1F/events.inc"
+	.include "data/maps/FallarborTown_PokemonCenter_2F/events.inc"
+	.include "data/maps/FallarborTown_House1/events.inc"
+	.include "data/maps/FallarborTown_House2/events.inc"
+	.include "data/maps/VerdanturfTown_BattleTentLobby/events.inc"
+	.include "data/maps/VerdanturfTown_BattleTentCorridor/events.inc"
+	.include "data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc"
+	.include "data/maps/VerdanturfTown_Mart/events.inc"
+	.include "data/maps/VerdanturfTown_PokemonCenter_1F/events.inc"
+	.include "data/maps/VerdanturfTown_PokemonCenter_2F/events.inc"
+	.include "data/maps/VerdanturfTown_WandasHouse/events.inc"
+	.include "data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc"
+	.include "data/maps/VerdanturfTown_House/events.inc"
+	.include "data/maps/PacifidlogTown_PokemonCenter_1F/events.inc"
+	.include "data/maps/PacifidlogTown_PokemonCenter_2F/events.inc"
+	.include "data/maps/PacifidlogTown_House1/events.inc"
+	.include "data/maps/PacifidlogTown_House2/events.inc"
+	.include "data/maps/PacifidlogTown_House3/events.inc"
+	.include "data/maps/PacifidlogTown_House4/events.inc"
+	.include "data/maps/PacifidlogTown_House5/events.inc"
+	.include "data/maps/PetalburgCity_WallysHouse/events.inc"
+	.include "data/maps/PetalburgCity_Gym/events.inc"
+	.include "data/maps/PetalburgCity_House1/events.inc"
+	.include "data/maps/PetalburgCity_House2/events.inc"
+	.include "data/maps/PetalburgCity_PokemonCenter_1F/events.inc"
+	.include "data/maps/PetalburgCity_PokemonCenter_2F/events.inc"
+	.include "data/maps/PetalburgCity_Mart/events.inc"
+	.include "data/maps/SlateportCity_SternsShipyard_1F/events.inc"
+	.include "data/maps/SlateportCity_SternsShipyard_2F/events.inc"
+	.include "data/maps/SlateportCity_BattleTentLobby/events.inc"
+	.include "data/maps/SlateportCity_BattleTentCorridor/events.inc"
+	.include "data/maps/SlateportCity_BattleTentBattleRoom/events.inc"
+	.include "data/maps/SlateportCity_House1/events.inc"
+	.include "data/maps/SlateportCity_PokemonFanClub/events.inc"
+	.include "data/maps/SlateportCity_OceanicMuseum_1F/events.inc"
+	.include "data/maps/SlateportCity_OceanicMuseum_2F/events.inc"
+	.include "data/maps/SlateportCity_Harbor/events.inc"
+	.include "data/maps/SlateportCity_House2/events.inc"
+	.include "data/maps/SlateportCity_PokemonCenter_1F/events.inc"
+	.include "data/maps/SlateportCity_PokemonCenter_2F/events.inc"
+	.include "data/maps/SlateportCity_Mart/events.inc"
+	.include "data/maps/MauvilleCity_Gym/events.inc"
+	.include "data/maps/MauvilleCity_BikeShop/events.inc"
+	.include "data/maps/MauvilleCity_House1/events.inc"
+	.include "data/maps/MauvilleCity_GameCorner/events.inc"
+	.include "data/maps/MauvilleCity_House2/events.inc"
+	.include "data/maps/MauvilleCity_PokemonCenter_1F/events.inc"
+	.include "data/maps/MauvilleCity_PokemonCenter_2F/events.inc"
+	.include "data/maps/MauvilleCity_Mart/events.inc"
+	.include "data/maps/RustboroCity_DevonCorp_1F/events.inc"
+	.include "data/maps/RustboroCity_DevonCorp_2F/events.inc"
+	.include "data/maps/RustboroCity_DevonCorp_3F/events.inc"
+	.include "data/maps/RustboroCity_Gym/events.inc"
+	.include "data/maps/RustboroCity_PokemonSchool/events.inc"
+	.include "data/maps/RustboroCity_PokemonCenter_1F/events.inc"
+	.include "data/maps/RustboroCity_PokemonCenter_2F/events.inc"
+	.include "data/maps/RustboroCity_Mart/events.inc"
+	.include "data/maps/RustboroCity_Flat1_1F/events.inc"
+	.include "data/maps/RustboroCity_Flat1_2F/events.inc"
+	.include "data/maps/RustboroCity_House1/events.inc"
+	.include "data/maps/RustboroCity_CuttersHouse/events.inc"
+	.include "data/maps/RustboroCity_House2/events.inc"
+	.include "data/maps/RustboroCity_Flat2_1F/events.inc"
+	.include "data/maps/RustboroCity_Flat2_2F/events.inc"
+	.include "data/maps/RustboroCity_Flat2_3F/events.inc"
+	.include "data/maps/RustboroCity_House3/events.inc"
+	.include "data/maps/FortreeCity_House1/events.inc"
+	.include "data/maps/FortreeCity_Gym/events.inc"
+	.include "data/maps/FortreeCity_PokemonCenter_1F/events.inc"
+	.include "data/maps/FortreeCity_PokemonCenter_2F/events.inc"
+	.include "data/maps/FortreeCity_Mart/events.inc"
+	.include "data/maps/FortreeCity_House2/events.inc"
+	.include "data/maps/FortreeCity_House3/events.inc"
+	.include "data/maps/FortreeCity_House4/events.inc"
+	.include "data/maps/FortreeCity_House5/events.inc"
+	.include "data/maps/FortreeCity_DecorationShop/events.inc"
+	.include "data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc"
+	.include "data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc"
+	.include "data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc"
+	.include "data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc"
+	.include "data/maps/LilycoveCity_ContestLobby/events.inc"
+	.include "data/maps/LilycoveCity_ContestHall/events.inc"
+	.include "data/maps/LilycoveCity_PokemonCenter_1F/events.inc"
+	.include "data/maps/LilycoveCity_PokemonCenter_2F/events.inc"
+	.include "data/maps/LilycoveCity_UnusedMart/events.inc"
+	.include "data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc"
+	.include "data/maps/LilycoveCity_Harbor/events.inc"
+	.include "data/maps/LilycoveCity_MoveDeletersHouse/events.inc"
+	.include "data/maps/LilycoveCity_House1/events.inc"
+	.include "data/maps/LilycoveCity_House2/events.inc"
+	.include "data/maps/LilycoveCity_House3/events.inc"
+	.include "data/maps/LilycoveCity_House4/events.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_1F/events.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_2F/events.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_3F/events.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_4F/events.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_5F/events.inc"
+	.include "data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc"
+	.include "data/maps/LilycoveCity_DepartmentStoreElevator/events.inc"
+	.include "data/maps/MossdeepCity_Gym/events.inc"
+	.include "data/maps/MossdeepCity_House1/events.inc"
+	.include "data/maps/MossdeepCity_House2/events.inc"
+	.include "data/maps/MossdeepCity_PokemonCenter_1F/events.inc"
+	.include "data/maps/MossdeepCity_PokemonCenter_2F/events.inc"
+	.include "data/maps/MossdeepCity_Mart/events.inc"
+	.include "data/maps/MossdeepCity_House3/events.inc"
+	.include "data/maps/MossdeepCity_StevensHouse/events.inc"
+	.include "data/maps/MossdeepCity_House4/events.inc"
+	.include "data/maps/MossdeepCity_SpaceCenter_1F/events.inc"
+	.include "data/maps/MossdeepCity_SpaceCenter_2F/events.inc"
+	.include "data/maps/MossdeepCity_GameCorner_1F/events.inc"
+	.include "data/maps/MossdeepCity_GameCorner_B1F/events.inc"
+	.include "data/maps/SootopolisCity_Gym_1F/events.inc"
+	.include "data/maps/SootopolisCity_Gym_B1F/events.inc"
+	.include "data/maps/SootopolisCity_PokemonCenter_1F/events.inc"
+	.include "data/maps/SootopolisCity_PokemonCenter_2F/events.inc"
+	.include "data/maps/SootopolisCity_Mart/events.inc"
+	.include "data/maps/SootopolisCity_House1/events.inc"
+	.include "data/maps/SootopolisCity_House2/events.inc"
+	.include "data/maps/SootopolisCity_House3/events.inc"
+	.include "data/maps/SootopolisCity_House4/events.inc"
+	.include "data/maps/SootopolisCity_House5/events.inc"
+	.include "data/maps/SootopolisCity_House6/events.inc"
+	.include "data/maps/SootopolisCity_House7/events.inc"
+	.include "data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc"
+	.include "data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc"
+	.include "data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc"
+	.include "data/maps/EverGrandeCity_SidneysRoom/events.inc"
+	.include "data/maps/EverGrandeCity_PhoebesRoom/events.inc"
+	.include "data/maps/EverGrandeCity_GlaciasRoom/events.inc"
+	.include "data/maps/EverGrandeCity_DrakesRoom/events.inc"
+	.include "data/maps/EverGrandeCity_ChampionsRoom/events.inc"
+	.include "data/maps/EverGrandeCity_Hall1/events.inc"
+	.include "data/maps/EverGrandeCity_Hall2/events.inc"
+	.include "data/maps/EverGrandeCity_Hall3/events.inc"
+	.include "data/maps/EverGrandeCity_Hall4/events.inc"
+	.include "data/maps/EverGrandeCity_Hall5/events.inc"
+	.include "data/maps/EverGrandeCity_PokemonLeague_1F/events.inc"
+	.include "data/maps/EverGrandeCity_HallOfFame/events.inc"
+	.include "data/maps/EverGrandeCity_PokemonCenter_1F/events.inc"
+	.include "data/maps/EverGrandeCity_PokemonCenter_2F/events.inc"
+	.include "data/maps/EverGrandeCity_PokemonLeague_2F/events.inc"
+	.include "data/maps/Route104_MrBrineysHouse/events.inc"
+	.include "data/maps/Route104_PrettyPetalFlowerShop/events.inc"
+	.include "data/maps/Route111_WinstrateFamilysHouse/events.inc"
+	.include "data/maps/Route111_OldLadysRestStop/events.inc"
+	.include "data/maps/Route112_CableCarStation/events.inc"
+	.include "data/maps/MtChimney_CableCarStation/events.inc"
+	.include "data/maps/Route114_FossilManiacsHouse/events.inc"
+	.include "data/maps/Route114_FossilManiacsTunnel/events.inc"
+	.include "data/maps/Route114_LanettesHouse/events.inc"
+	.include "data/maps/Route116_TunnelersRestHouse/events.inc"
+	.include "data/maps/Route117_PokemonDayCare/events.inc"
+	.include "data/maps/Route121_SafariZoneEntrance/events.inc"
+	.include "data/maps/MeteorFalls_1F_1R/events.inc"
+	.include "data/maps/MeteorFalls_1F_2R/events.inc"
+	.include "data/maps/MeteorFalls_B1F_1R/events.inc"
+	.include "data/maps/MeteorFalls_B1F_2R/events.inc"
+	.include "data/maps/RusturfTunnel/events.inc"
+	.include "data/maps/Underwater_SootopolisCity/events.inc"
+	.include "data/maps/DesertRuins/events.inc"
+	.include "data/maps/GraniteCave_1F/events.inc"
+	.include "data/maps/GraniteCave_B1F/events.inc"
+	.include "data/maps/GraniteCave_B2F/events.inc"
+	.include "data/maps/GraniteCave_StevensRoom/events.inc"
+	.include "data/maps/PetalburgWoods/events.inc"
+	.include "data/maps/MtChimney/events.inc"
+	.include "data/maps/JaggedPass/events.inc"
+	.include "data/maps/FieryPath/events.inc"
+	.include "data/maps/MtPyre_1F/events.inc"
+	.include "data/maps/MtPyre_2F/events.inc"
+	.include "data/maps/MtPyre_3F/events.inc"
+	.include "data/maps/MtPyre_4F/events.inc"
+	.include "data/maps/MtPyre_5F/events.inc"
+	.include "data/maps/MtPyre_6F/events.inc"
+	.include "data/maps/MtPyre_Exterior/events.inc"
+	.include "data/maps/MtPyre_Summit/events.inc"
+	.include "data/maps/AquaHideout_1F/events.inc"
+	.include "data/maps/AquaHideout_B1F/events.inc"
+	.include "data/maps/AquaHideout_B2F/events.inc"
+	.include "data/maps/Underwater_SeafloorCavern/events.inc"
+	.include "data/maps/SeafloorCavern_Entrance/events.inc"
+	.include "data/maps/SeafloorCavern_Room1/events.inc"
+	.include "data/maps/SeafloorCavern_Room2/events.inc"
+	.include "data/maps/SeafloorCavern_Room3/events.inc"
+	.include "data/maps/SeafloorCavern_Room4/events.inc"
+	.include "data/maps/SeafloorCavern_Room5/events.inc"
+	.include "data/maps/SeafloorCavern_Room6/events.inc"
+	.include "data/maps/SeafloorCavern_Room7/events.inc"
+	.include "data/maps/SeafloorCavern_Room8/events.inc"
+	.include "data/maps/SeafloorCavern_Room9/events.inc"
+	.include "data/maps/CaveOfOrigin_Entrance/events.inc"
+	.include "data/maps/CaveOfOrigin_1F/events.inc"
+	.include "data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc"
+	.include "data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc"
+	.include "data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc"
+	.include "data/maps/CaveOfOrigin_B1F/events.inc"
+	.include "data/maps/VictoryRoad_1F/events.inc"
+	.include "data/maps/VictoryRoad_B1F/events.inc"
+	.include "data/maps/VictoryRoad_B2F/events.inc"
+	.include "data/maps/ShoalCave_LowTideEntranceRoom/events.inc"
+	.include "data/maps/ShoalCave_LowTideInnerRoom/events.inc"
+	.include "data/maps/ShoalCave_LowTideStairsRoom/events.inc"
+	.include "data/maps/ShoalCave_LowTideLowerRoom/events.inc"
+	.include "data/maps/ShoalCave_HighTideEntranceRoom/events.inc"
+	.include "data/maps/ShoalCave_HighTideInnerRoom/events.inc"
+	.include "data/maps/NewMauville_Entrance/events.inc"
+	.include "data/maps/NewMauville_Inside/events.inc"
+	.include "data/maps/AbandonedShip_Deck/events.inc"
+	.include "data/maps/AbandonedShip_Corridors_1F/events.inc"
+	.include "data/maps/AbandonedShip_Rooms_1F/events.inc"
+	.include "data/maps/AbandonedShip_Corridors_B1F/events.inc"
+	.include "data/maps/AbandonedShip_Rooms_B1F/events.inc"
+	.include "data/maps/AbandonedShip_Rooms2_B1F/events.inc"
+	.include "data/maps/AbandonedShip_Underwater1/events.inc"
+	.include "data/maps/AbandonedShip_Room_B1F/events.inc"
+	.include "data/maps/AbandonedShip_Rooms2_1F/events.inc"
+	.include "data/maps/AbandonedShip_CaptainsOffice/events.inc"
+	.include "data/maps/AbandonedShip_Underwater2/events.inc"
+	.include "data/maps/AbandonedShip_HiddenFloorCorridors/events.inc"
+	.include "data/maps/AbandonedShip_HiddenFloorRooms/events.inc"
+	.include "data/maps/IslandCave/events.inc"
+	.include "data/maps/AncientTomb/events.inc"
+	.include "data/maps/Underwater_Route134/events.inc"
+	.include "data/maps/Underwater_SealedChamber/events.inc"
+	.include "data/maps/SealedChamber_OuterRoom/events.inc"
+	.include "data/maps/SealedChamber_InnerRoom/events.inc"
+	.include "data/maps/ScorchedSlab/events.inc"
+	.include "data/maps/AquaHideout_UnusedRubyMap1/events.inc"
+	.include "data/maps/AquaHideout_UnusedRubyMap2/events.inc"
+	.include "data/maps/AquaHideout_UnusedRubyMap3/events.inc"
+	.include "data/maps/SkyPillar_Entrance/events.inc"
+	.include "data/maps/SkyPillar_Outside/events.inc"
+	.include "data/maps/SkyPillar_1F/events.inc"
+	.include "data/maps/SkyPillar_2F/events.inc"
+	.include "data/maps/SkyPillar_3F/events.inc"
+	.include "data/maps/SkyPillar_4F/events.inc"
+	.include "data/maps/ShoalCave_LowTideIceRoom/events.inc"
+	.include "data/maps/SkyPillar_5F/events.inc"
+	.include "data/maps/SkyPillar_Top/events.inc"
+	.include "data/maps/MagmaHideout_1F/events.inc"
+	.include "data/maps/MagmaHideout_2F_1R/events.inc"
+	.include "data/maps/MagmaHideout_2F_2R/events.inc"
+	.include "data/maps/MagmaHideout_3F_1R/events.inc"
+	.include "data/maps/MagmaHideout_3F_2R/events.inc"
+	.include "data/maps/MagmaHideout_4F/events.inc"
+	.include "data/maps/MagmaHideout_3F_3R/events.inc"
+	.include "data/maps/MagmaHideout_2F_3R/events.inc"
+	.include "data/maps/MirageTower_1F/events.inc"
+	.include "data/maps/MirageTower_2F/events.inc"
+	.include "data/maps/MirageTower_3F/events.inc"
+	.include "data/maps/MirageTower_4F/events.inc"
+	.include "data/maps/DesertUnderpass/events.inc"
+	.include "data/maps/ArtisanCave_B1F/events.inc"
+	.include "data/maps/ArtisanCave_1F/events.inc"
+	.include "data/maps/Underwater_MarineCave/events.inc"
+	.include "data/maps/MarineCave_Entrance/events.inc"
+	.include "data/maps/MarineCave_End/events.inc"
+	.include "data/maps/TerraCave_Entrance/events.inc"
+	.include "data/maps/TerraCave_End/events.inc"
+	.include "data/maps/AlteringCave/events.inc"
+	.include "data/maps/MeteorFalls_StevensCave/events.inc"
+	.include "data/maps/SecretBase_RedCave1/events.inc"
+	.include "data/maps/SecretBase_BrownCave1/events.inc"
+	.include "data/maps/SecretBase_BlueCave1/events.inc"
+	.include "data/maps/SecretBase_YellowCave1/events.inc"
+	.include "data/maps/SecretBase_Tree1/events.inc"
+	.include "data/maps/SecretBase_Shrub1/events.inc"
+	.include "data/maps/SecretBase_RedCave2/events.inc"
+	.include "data/maps/SecretBase_BrownCave2/events.inc"
+	.include "data/maps/SecretBase_BlueCave2/events.inc"
+	.include "data/maps/SecretBase_YellowCave2/events.inc"
+	.include "data/maps/SecretBase_Tree2/events.inc"
+	.include "data/maps/SecretBase_Shrub2/events.inc"
+	.include "data/maps/SecretBase_RedCave3/events.inc"
+	.include "data/maps/SecretBase_BrownCave3/events.inc"
+	.include "data/maps/SecretBase_BlueCave3/events.inc"
+	.include "data/maps/SecretBase_YellowCave3/events.inc"
+	.include "data/maps/SecretBase_Tree3/events.inc"
+	.include "data/maps/SecretBase_Shrub3/events.inc"
+	.include "data/maps/SecretBase_RedCave4/events.inc"
+	.include "data/maps/SecretBase_BrownCave4/events.inc"
+	.include "data/maps/SecretBase_BlueCave4/events.inc"
+	.include "data/maps/SecretBase_YellowCave4/events.inc"
+	.include "data/maps/SecretBase_Tree4/events.inc"
+	.include "data/maps/SecretBase_Shrub4/events.inc"
+	.include "data/maps/SingleBattleColosseum/events.inc"
+	.include "data/maps/TradeCenter/events.inc"
+	.include "data/maps/RecordCorner/events.inc"
+	.include "data/maps/DoubleBattleColosseum/events.inc"
+	.include "data/maps/LinkContestRoom1/events.inc"
+	.include "data/maps/LinkContestRoom2/events.inc"
+	.include "data/maps/LinkContestRoom3/events.inc"
+	.include "data/maps/LinkContestRoom4/events.inc"
+	.include "data/maps/LinkContestRoom5/events.inc"
+	.include "data/maps/LinkContestRoom6/events.inc"
+	.include "data/maps/UnknownMap_25_29/events.inc"
+	.include "data/maps/UnknownMap_25_30/events.inc"
+	.include "data/maps/UnknownMap_25_31/events.inc"
+	.include "data/maps/UnknownMap_25_32/events.inc"
+	.include "data/maps/UnknownMap_25_33/events.inc"
+	.include "data/maps/UnknownMap_25_34/events.inc"
+	.include "data/maps/InsideOfTruck/events.inc"
+	.include "data/maps/SSTidalCorridor/events.inc"
+	.include "data/maps/SSTidalLowerDeck/events.inc"
+	.include "data/maps/SSTidalRooms/events.inc"
+	.include "data/maps/BattlePyramidSquare01/events.inc"
+	.include "data/maps/BattlePyramidSquare02/events.inc"
+	.include "data/maps/BattlePyramidSquare03/events.inc"
+	.include "data/maps/BattlePyramidSquare04/events.inc"
+	.include "data/maps/BattlePyramidSquare05/events.inc"
+	.include "data/maps/BattlePyramidSquare06/events.inc"
+	.include "data/maps/BattlePyramidSquare07/events.inc"
+	.include "data/maps/BattlePyramidSquare08/events.inc"
+	.include "data/maps/BattlePyramidSquare09/events.inc"
+	.include "data/maps/BattlePyramidSquare10/events.inc"
+	.include "data/maps/BattlePyramidSquare11/events.inc"
+	.include "data/maps/BattlePyramidSquare12/events.inc"
+	.include "data/maps/BattlePyramidSquare13/events.inc"
+	.include "data/maps/BattlePyramidSquare14/events.inc"
+	.include "data/maps/BattlePyramidSquare15/events.inc"
+	.include "data/maps/BattlePyramidSquare16/events.inc"
+	.include "data/maps/UnionRoom/events.inc"
+	.include "data/maps/SafariZone_Northwest/events.inc"
+	.include "data/maps/SafariZone_North/events.inc"
+	.include "data/maps/SafariZone_Southwest/events.inc"
+	.include "data/maps/SafariZone_South/events.inc"
+	.include "data/maps/BattleFrontier_OutsideWest/events.inc"
+	.include "data/maps/BattleFrontier_BattleTowerLobby/events.inc"
+	.include "data/maps/BattleFrontier_BattleTowerElevator/events.inc"
+	.include "data/maps/BattleFrontier_BattleTowerCorridor/events.inc"
+	.include "data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc"
+	.include "data/maps/SouthernIsland_Exterior/events.inc"
+	.include "data/maps/SouthernIsland_Interior/events.inc"
+	.include "data/maps/SafariZone_RestHouse/events.inc"
+	.include "data/maps/SafariZone_Northeast/events.inc"
+	.include "data/maps/SafariZone_Southeast/events.inc"
+	.include "data/maps/BattleFrontier_OutsideEast/events.inc"
+	.include "data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc"
+	.include "data/maps/BattleFrontier_BattleTowerCorridor2/events.inc"
+	.include "data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc"
+	.include "data/maps/BattleFrontier_BattleDomeLobby/events.inc"
+	.include "data/maps/BattleFrontier_BattleDomeCorridor/events.inc"
+	.include "data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc"
+	.include "data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc"
+	.include "data/maps/BattleFrontier_BattlePalaceLobby/events.inc"
+	.include "data/maps/BattleFrontier_BattlePalaceCorridor/events.inc"
+	.include "data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc"
+	.include "data/maps/BattleFrontier_BattlePyramidLobby/events.inc"
+	.include "data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc"
+	.include "data/maps/BattleFrontier_BattlePyramidTop/events.inc"
+	.include "data/maps/BattleFrontier_BattleArenaLobby/events.inc"
+	.include "data/maps/BattleFrontier_BattleArenaCorridor/events.inc"
+	.include "data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc"
+	.include "data/maps/BattleFrontier_BattleFactoryLobby/events.inc"
+	.include "data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc"
+	.include "data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc"
+	.include "data/maps/BattleFrontier_BattlePikeLobby/events.inc"
+	.include "data/maps/BattleFrontier_BattlePikeCorridor/events.inc"
+	.include "data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc"
+	.include "data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc"
+	.include "data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc"
+	.include "data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc"
+	.include "data/maps/BattleFrontier_RankingHall/events.inc"
+	.include "data/maps/BattleFrontier_Lounge1/events.inc"
+	.include "data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc"
+	.include "data/maps/BattleFrontier_Lounge2/events.inc"
+	.include "data/maps/BattleFrontier_Lounge3/events.inc"
+	.include "data/maps/BattleFrontier_Lounge4/events.inc"
+	.include "data/maps/BattleFrontier_ScottsHouse/events.inc"
+	.include "data/maps/BattleFrontier_Lounge5/events.inc"
+	.include "data/maps/BattleFrontier_Lounge6/events.inc"
+	.include "data/maps/BattleFrontier_Lounge7/events.inc"
+	.include "data/maps/BattleFrontier_ReceptionGate/events.inc"
+	.include "data/maps/BattleFrontier_Lounge8/events.inc"
+	.include "data/maps/BattleFrontier_Lounge9/events.inc"
+	.include "data/maps/BattleFrontier_PokemonCenter_1F/events.inc"
+	.include "data/maps/BattleFrontier_PokemonCenter_2F/events.inc"
+	.include "data/maps/BattleFrontier_Mart/events.inc"
+	.include "data/maps/FarawayIsland_Entrance/events.inc"
+	.include "data/maps/FarawayIsland_Interior/events.inc"
+	.include "data/maps/BirthIsland_Exterior/events.inc"
+	.include "data/maps/BirthIsland_Harbor/events.inc"
+	.include "data/maps/TrainerHill_Entrance/events.inc"
+	.include "data/maps/TrainerHill_1F/events.inc"
+	.include "data/maps/TrainerHill_2F/events.inc"
+	.include "data/maps/TrainerHill_3F/events.inc"
+	.include "data/maps/TrainerHill_4F/events.inc"
+	.include "data/maps/TrainerHill_Roof/events.inc"
+	.include "data/maps/NavelRock_Exterior/events.inc"
+	.include "data/maps/NavelRock_Harbor/events.inc"
+	.include "data/maps/NavelRock_Entrance/events.inc"
+	.include "data/maps/NavelRock_B1F/events.inc"
+	.include "data/maps/NavelRock_Fork/events.inc"
+	.include "data/maps/NavelRock_Up1/events.inc"
+	.include "data/maps/NavelRock_Up2/events.inc"
+	.include "data/maps/NavelRock_Up3/events.inc"
+	.include "data/maps/NavelRock_Up4/events.inc"
+	.include "data/maps/NavelRock_Top/events.inc"
+	.include "data/maps/NavelRock_Down01/events.inc"
+	.include "data/maps/NavelRock_Down02/events.inc"
+	.include "data/maps/NavelRock_Down03/events.inc"
+	.include "data/maps/NavelRock_Down04/events.inc"
+	.include "data/maps/NavelRock_Down05/events.inc"
+	.include "data/maps/NavelRock_Down06/events.inc"
+	.include "data/maps/NavelRock_Down07/events.inc"
+	.include "data/maps/NavelRock_Down08/events.inc"
+	.include "data/maps/NavelRock_Down09/events.inc"
+	.include "data/maps/NavelRock_Down10/events.inc"
+	.include "data/maps/NavelRock_Down11/events.inc"
+	.include "data/maps/NavelRock_Bottom/events.inc"
+	.include "data/maps/TrainerHill_Elevator/events.inc"
+	.include "data/maps/Route104_Prototype/events.inc"
+	.include "data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc"
+	.include "data/maps/Route109_SeashoreHouse/events.inc"
+	.include "data/maps/Route110_TrickHouseEntrance/events.inc"
+	.include "data/maps/Route110_TrickHouseEnd/events.inc"
+	.include "data/maps/Route110_TrickHouseCorridor/events.inc"
+	.include "data/maps/Route110_TrickHousePuzzle1/events.inc"
+	.include "data/maps/Route110_TrickHousePuzzle2/events.inc"
+	.include "data/maps/Route110_TrickHousePuzzle3/events.inc"
+	.include "data/maps/Route110_TrickHousePuzzle4/events.inc"
+	.include "data/maps/Route110_TrickHousePuzzle5/events.inc"
+	.include "data/maps/Route110_TrickHousePuzzle6/events.inc"
+	.include "data/maps/Route110_TrickHousePuzzle7/events.inc"
+	.include "data/maps/Route110_TrickHousePuzzle8/events.inc"
+	.include "data/maps/Route110_SeasideCyclingRoadEntrance1/events.inc"
+	.include "data/maps/Route110_SeasideCyclingRoadEntrance2/events.inc"
+	.include "data/maps/Route113_GlassWorkshop/events.inc"
+	.include "data/maps/Route123_BerryMastersHouse/events.inc"
+	.include "data/maps/Route119_WeatherInstitute_1F/events.inc"
+	.include "data/maps/Route119_WeatherInstitute_2F/events.inc"
+	.include "data/maps/Route119_House/events.inc"
+	.include "data/maps/Route124_DivingTreasureHuntersHouse/events.inc"
 
diff --git a/data/maps/events/AbandonedShip_CaptainsOffice.inc b/data/maps/AbandonedShip_CaptainsOffice/events.inc
index e7e48568c..e7e48568c 100644
--- a/data/maps/events/AbandonedShip_CaptainsOffice.inc
+++ b/data/maps/AbandonedShip_CaptainsOffice/events.inc
diff --git a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc
index 5b3941dd2..5b3941dd2 100644
--- a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc
+++ b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc
diff --git a/data/maps/events/AbandonedShip_Corridors_1F.inc b/data/maps/AbandonedShip_Corridors_1F/events.inc
index f0e276032..f0e276032 100644
--- a/data/maps/events/AbandonedShip_Corridors_1F.inc
+++ b/data/maps/AbandonedShip_Corridors_1F/events.inc
diff --git a/data/scripts/maps/AbandonedShip_Corridors_1F.inc b/data/maps/AbandonedShip_Corridors_1F/scripts.inc
index 39c7861a1..39c7861a1 100644
--- a/data/scripts/maps/AbandonedShip_Corridors_1F.inc
+++ b/data/maps/AbandonedShip_Corridors_1F/scripts.inc
diff --git a/data/maps/events/AbandonedShip_Corridors_B1F.inc b/data/maps/AbandonedShip_Corridors_B1F/events.inc
index d1ee69499..d1ee69499 100644
--- a/data/maps/events/AbandonedShip_Corridors_B1F.inc
+++ b/data/maps/AbandonedShip_Corridors_B1F/events.inc
diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc
index f19dfe322..f19dfe322 100644
--- a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc
+++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc
diff --git a/data/maps/events/AbandonedShip_Deck.inc b/data/maps/AbandonedShip_Deck/events.inc
index 289f917af..289f917af 100644
--- a/data/maps/events/AbandonedShip_Deck.inc
+++ b/data/maps/AbandonedShip_Deck/events.inc
diff --git a/data/scripts/maps/AbandonedShip_Deck.inc b/data/maps/AbandonedShip_Deck/scripts.inc
index 1f0c0e2f2..1f0c0e2f2 100644
--- a/data/scripts/maps/AbandonedShip_Deck.inc
+++ b/data/maps/AbandonedShip_Deck/scripts.inc
diff --git a/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc
index fd5cb4ac8..fd5cb4ac8 100644
--- a/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc
diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc
index 2cd278f91..2cd278f91 100644
--- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc
diff --git a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc
index e352635a5..e352635a5 100644
--- a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc
diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc
index 701b79fbf..701b79fbf 100644
--- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc
diff --git a/data/maps/events/AbandonedShip_Room_B1F.inc b/data/maps/AbandonedShip_Room_B1F/events.inc
index 1f1cab59a..1f1cab59a 100644
--- a/data/maps/events/AbandonedShip_Room_B1F.inc
+++ b/data/maps/AbandonedShip_Room_B1F/events.inc
diff --git a/data/scripts/maps/AbandonedShip_Room_B1F.inc b/data/maps/AbandonedShip_Room_B1F/scripts.inc
index 5dd7a2bad..5dd7a2bad 100644
--- a/data/scripts/maps/AbandonedShip_Room_B1F.inc
+++ b/data/maps/AbandonedShip_Room_B1F/scripts.inc
diff --git a/data/maps/events/AbandonedShip_Rooms2_1F.inc b/data/maps/AbandonedShip_Rooms2_1F/events.inc
index 7dfb4d059..7dfb4d059 100644
--- a/data/maps/events/AbandonedShip_Rooms2_1F.inc
+++ b/data/maps/AbandonedShip_Rooms2_1F/events.inc
diff --git a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc
index 2ffe3afc7..2ffe3afc7 100644
--- a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc
+++ b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc
diff --git a/data/maps/events/AbandonedShip_Rooms2_B1F.inc b/data/maps/AbandonedShip_Rooms2_B1F/events.inc
index 40e4600af..40e4600af 100644
--- a/data/maps/events/AbandonedShip_Rooms2_B1F.inc
+++ b/data/maps/AbandonedShip_Rooms2_B1F/events.inc
diff --git a/data/scripts/maps/AbandonedShip_Rooms2_B1F.inc b/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc
index 00b3d0fb9..00b3d0fb9 100644
--- a/data/scripts/maps/AbandonedShip_Rooms2_B1F.inc
+++ b/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc
diff --git a/data/maps/events/AbandonedShip_Rooms_1F.inc b/data/maps/AbandonedShip_Rooms_1F/events.inc
index 072892b0a..072892b0a 100644
--- a/data/maps/events/AbandonedShip_Rooms_1F.inc
+++ b/data/maps/AbandonedShip_Rooms_1F/events.inc
diff --git a/data/scripts/maps/AbandonedShip_Rooms_1F.inc b/data/maps/AbandonedShip_Rooms_1F/scripts.inc
index 2a6bc36b6..2a6bc36b6 100644
--- a/data/scripts/maps/AbandonedShip_Rooms_1F.inc
+++ b/data/maps/AbandonedShip_Rooms_1F/scripts.inc
diff --git a/data/maps/events/AbandonedShip_Rooms_B1F.inc b/data/maps/AbandonedShip_Rooms_B1F/events.inc
index 50bc7c0ee..50bc7c0ee 100644
--- a/data/maps/events/AbandonedShip_Rooms_B1F.inc
+++ b/data/maps/AbandonedShip_Rooms_B1F/events.inc
diff --git a/data/scripts/maps/AbandonedShip_Rooms_B1F.inc b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc
index d4a5c9233..d4a5c9233 100644
--- a/data/scripts/maps/AbandonedShip_Rooms_B1F.inc
+++ b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc
diff --git a/data/maps/events/AbandonedShip_Underwater1.inc b/data/maps/AbandonedShip_Underwater1/events.inc
index 5c9af3c10..5c9af3c10 100644
--- a/data/maps/events/AbandonedShip_Underwater1.inc
+++ b/data/maps/AbandonedShip_Underwater1/events.inc
diff --git a/data/scripts/maps/AbandonedShip_Underwater1.inc b/data/maps/AbandonedShip_Underwater1/scripts.inc
index 7e39b1939..7e39b1939 100644
--- a/data/scripts/maps/AbandonedShip_Underwater1.inc
+++ b/data/maps/AbandonedShip_Underwater1/scripts.inc
diff --git a/data/maps/events/AbandonedShip_Underwater2.inc b/data/maps/AbandonedShip_Underwater2/events.inc
index f06c21b2a..f06c21b2a 100644
--- a/data/maps/events/AbandonedShip_Underwater2.inc
+++ b/data/maps/AbandonedShip_Underwater2/events.inc
diff --git a/data/scripts/maps/AbandonedShip_Underwater2.inc b/data/maps/AbandonedShip_Underwater2/scripts.inc
index 17f52c691..17f52c691 100644
--- a/data/scripts/maps/AbandonedShip_Underwater2.inc
+++ b/data/maps/AbandonedShip_Underwater2/scripts.inc
diff --git a/data/maps/events/AlteringCave.inc b/data/maps/AlteringCave/events.inc
index 898038715..898038715 100644
--- a/data/maps/events/AlteringCave.inc
+++ b/data/maps/AlteringCave/events.inc
diff --git a/data/scripts/maps/AlteringCave.inc b/data/maps/AlteringCave/scripts.inc
index a9faddc36..a9faddc36 100644
--- a/data/scripts/maps/AlteringCave.inc
+++ b/data/maps/AlteringCave/scripts.inc
diff --git a/data/maps/events/AncientTomb.inc b/data/maps/AncientTomb/events.inc
index 4950be4ac..4950be4ac 100644
--- a/data/maps/events/AncientTomb.inc
+++ b/data/maps/AncientTomb/events.inc
diff --git a/data/scripts/maps/AncientTomb.inc b/data/maps/AncientTomb/scripts.inc
index 3cd0b9eff..3cd0b9eff 100644
--- a/data/scripts/maps/AncientTomb.inc
+++ b/data/maps/AncientTomb/scripts.inc
diff --git a/data/maps/events/AquaHideout_1F.inc b/data/maps/AquaHideout_1F/events.inc
index 7d0befd16..7d0befd16 100644
--- a/data/maps/events/AquaHideout_1F.inc
+++ b/data/maps/AquaHideout_1F/events.inc
diff --git a/data/scripts/maps/AquaHideout_1F.inc b/data/maps/AquaHideout_1F/scripts.inc
index 9172c3927..9172c3927 100644
--- a/data/scripts/maps/AquaHideout_1F.inc
+++ b/data/maps/AquaHideout_1F/scripts.inc
diff --git a/data/maps/events/AquaHideout_B1F.inc b/data/maps/AquaHideout_B1F/events.inc
index 31108fa9c..31108fa9c 100644
--- a/data/maps/events/AquaHideout_B1F.inc
+++ b/data/maps/AquaHideout_B1F/events.inc
diff --git a/data/scripts/maps/AquaHideout_B1F.inc b/data/maps/AquaHideout_B1F/scripts.inc
index cf59bdacc..cf59bdacc 100644
--- a/data/scripts/maps/AquaHideout_B1F.inc
+++ b/data/maps/AquaHideout_B1F/scripts.inc
diff --git a/data/maps/events/AquaHideout_B2F.inc b/data/maps/AquaHideout_B2F/events.inc
index eca22f5f7..eca22f5f7 100644
--- a/data/maps/events/AquaHideout_B2F.inc
+++ b/data/maps/AquaHideout_B2F/events.inc
diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/maps/AquaHideout_B2F/scripts.inc
index fd3868512..fd3868512 100644
--- a/data/scripts/maps/AquaHideout_B2F.inc
+++ b/data/maps/AquaHideout_B2F/scripts.inc
diff --git a/data/maps/events/AquaHideout_UnusedRubyMap1.inc b/data/maps/AquaHideout_UnusedRubyMap1/events.inc
index 45663b68f..45663b68f 100644
--- a/data/maps/events/AquaHideout_UnusedRubyMap1.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap1/events.inc
diff --git a/data/scripts/maps/AquaHideout_UnusedRubyMap1.inc b/data/maps/AquaHideout_UnusedRubyMap1/scripts.inc
index 73cde82a9..73cde82a9 100644
--- a/data/scripts/maps/AquaHideout_UnusedRubyMap1.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap1/scripts.inc
diff --git a/data/maps/events/AquaHideout_UnusedRubyMap2.inc b/data/maps/AquaHideout_UnusedRubyMap2/events.inc
index 6f53de284..6f53de284 100644
--- a/data/maps/events/AquaHideout_UnusedRubyMap2.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap2/events.inc
diff --git a/data/scripts/maps/AquaHideout_UnusedRubyMap2.inc b/data/maps/AquaHideout_UnusedRubyMap2/scripts.inc
index 28901497a..28901497a 100644
--- a/data/scripts/maps/AquaHideout_UnusedRubyMap2.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap2/scripts.inc
diff --git a/data/maps/events/AquaHideout_UnusedRubyMap3.inc b/data/maps/AquaHideout_UnusedRubyMap3/events.inc
index 8a23a3786..8a23a3786 100644
--- a/data/maps/events/AquaHideout_UnusedRubyMap3.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap3/events.inc
diff --git a/data/scripts/maps/AquaHideout_UnusedRubyMap3.inc b/data/maps/AquaHideout_UnusedRubyMap3/scripts.inc
index de0e6d7dd..de0e6d7dd 100644
--- a/data/scripts/maps/AquaHideout_UnusedRubyMap3.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap3/scripts.inc
diff --git a/data/maps/events/ArtisanCave_1F.inc b/data/maps/ArtisanCave_1F/events.inc
index edd7429a3..edd7429a3 100644
--- a/data/maps/events/ArtisanCave_1F.inc
+++ b/data/maps/ArtisanCave_1F/events.inc
diff --git a/data/scripts/maps/ArtisanCave_1F.inc b/data/maps/ArtisanCave_1F/scripts.inc
index 18090ff68..18090ff68 100644
--- a/data/scripts/maps/ArtisanCave_1F.inc
+++ b/data/maps/ArtisanCave_1F/scripts.inc
diff --git a/data/maps/events/ArtisanCave_B1F.inc b/data/maps/ArtisanCave_B1F/events.inc
index a0b96c316..a0b96c316 100644
--- a/data/maps/events/ArtisanCave_B1F.inc
+++ b/data/maps/ArtisanCave_B1F/events.inc
diff --git a/data/scripts/maps/ArtisanCave_B1F.inc b/data/maps/ArtisanCave_B1F/scripts.inc
index 059343a56..059343a56 100644
--- a/data/scripts/maps/ArtisanCave_B1F.inc
+++ b/data/maps/ArtisanCave_B1F/scripts.inc
diff --git a/data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc
index ce6eeb952..ce6eeb952 100644
--- a/data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc
+++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc
diff --git a/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
index 076eeab6e..076eeab6e 100644
--- a/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc
+++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
diff --git a/data/maps/events/BattleFrontier_BattleArenaCorridor.inc b/data/maps/BattleFrontier_BattleArenaCorridor/events.inc
index 03a2cb14d..03a2cb14d 100644
--- a/data/maps/events/BattleFrontier_BattleArenaCorridor.inc
+++ b/data/maps/BattleFrontier_BattleArenaCorridor/events.inc
diff --git a/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc
index a353379c2..a353379c2 100644
--- a/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc
+++ b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc
diff --git a/data/maps/events/BattleFrontier_BattleArenaLobby.inc b/data/maps/BattleFrontier_BattleArenaLobby/events.inc
index d0343228b..d0343228b 100644
--- a/data/maps/events/BattleFrontier_BattleArenaLobby.inc
+++ b/data/maps/BattleFrontier_BattleArenaLobby/events.inc
diff --git a/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
index a376bfe22..a376bfe22 100644
--- a/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc
+++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
diff --git a/data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc
index 2500a826b..2500a826b 100644
--- a/data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc
+++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc
diff --git a/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
index e853afda0..e853afda0 100644
--- a/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc
+++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
diff --git a/data/maps/events/BattleFrontier_BattleDomeCorridor.inc b/data/maps/BattleFrontier_BattleDomeCorridor/events.inc
index 8a8d5448e..8a8d5448e 100644
--- a/data/maps/events/BattleFrontier_BattleDomeCorridor.inc
+++ b/data/maps/BattleFrontier_BattleDomeCorridor/events.inc
diff --git a/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc
index 989ebe2f3..989ebe2f3 100644
--- a/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc
+++ b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc
diff --git a/data/maps/events/BattleFrontier_BattleDomeLobby.inc b/data/maps/BattleFrontier_BattleDomeLobby/events.inc
index 9c6eb2649..9c6eb2649 100644
--- a/data/maps/events/BattleFrontier_BattleDomeLobby.inc
+++ b/data/maps/BattleFrontier_BattleDomeLobby/events.inc
diff --git a/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
index 1e50357bc..1e50357bc 100644
--- a/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc
+++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
diff --git a/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc
index 7f2133ac5..7f2133ac5 100644
--- a/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc
+++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc
diff --git a/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
index 024162cee..024162cee 100644
--- a/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc
+++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
diff --git a/data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc
index 2ea1fbd41..2ea1fbd41 100644
--- a/data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc
+++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc
diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
index 5b6a674fb..5b6a674fb 100644
--- a/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc
+++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
diff --git a/data/maps/events/BattleFrontier_BattleFactoryLobby.inc b/data/maps/BattleFrontier_BattleFactoryLobby/events.inc
index 13de4c539..13de4c539 100644
--- a/data/maps/events/BattleFrontier_BattleFactoryLobby.inc
+++ b/data/maps/BattleFrontier_BattleFactoryLobby/events.inc
diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc
index ec2483390..ec2483390 100644
--- a/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc
+++ b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc
diff --git a/data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc
index b8ffbfc6d..b8ffbfc6d 100644
--- a/data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc
+++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc
diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
index e05c49885..e05c49885 100644
--- a/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc
+++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
diff --git a/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc
index bc1d5a525..bc1d5a525 100644
--- a/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc
+++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc
diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
index 2ae154927..2ae154927 100644
--- a/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc
+++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
diff --git a/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc
index f6baf26f6..f6baf26f6 100644
--- a/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc
+++ b/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc
diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc
index c8142a207..c8142a207 100644
--- a/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc
+++ b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc
diff --git a/data/maps/events/BattleFrontier_BattlePalaceLobby.inc b/data/maps/BattleFrontier_BattlePalaceLobby/events.inc
index 56da378cb..56da378cb 100644
--- a/data/maps/events/BattleFrontier_BattlePalaceLobby.inc
+++ b/data/maps/BattleFrontier_BattlePalaceLobby/events.inc
diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
index 91c1abd0f..91c1abd0f 100644
--- a/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc
+++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
diff --git a/data/maps/events/BattleFrontier_BattlePikeCorridor.inc b/data/maps/BattleFrontier_BattlePikeCorridor/events.inc
index 67ceaaae6..67ceaaae6 100644
--- a/data/maps/events/BattleFrontier_BattlePikeCorridor.inc
+++ b/data/maps/BattleFrontier_BattlePikeCorridor/events.inc
diff --git a/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc
index 23ad26692..23ad26692 100644
--- a/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc
+++ b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc
diff --git a/data/maps/events/BattleFrontier_BattlePikeLobby.inc b/data/maps/BattleFrontier_BattlePikeLobby/events.inc
index 45d3da103..45d3da103 100644
--- a/data/maps/events/BattleFrontier_BattlePikeLobby.inc
+++ b/data/maps/BattleFrontier_BattlePikeLobby/events.inc
diff --git a/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
index 5323c4a6b..5323c4a6b 100644
--- a/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc
+++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
diff --git a/data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc
index 80c1fc3bf..80c1fc3bf 100644
--- a/data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc
diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc
index 509806531..509806531 100644
--- a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc
diff --git a/data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc
index 9cff20517..9cff20517 100644
--- a/data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc
diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc
index 4f0d4632b..4f0d4632b 100644
--- a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc
diff --git a/data/maps/events/BattleFrontier_BattlePikeRandomRoom3.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc
index 20e6cb085..20e6cb085 100644
--- a/data/maps/events/BattleFrontier_BattlePikeRandomRoom3.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc
diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc
index 9256764e8..9256764e8 100644
--- a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc
diff --git a/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc
index 7a23ba892..7a23ba892 100644
--- a/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc
+++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc
diff --git a/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
index a4725036b..a4725036b 100644
--- a/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc
+++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
diff --git a/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc
index 7a8c584ac..7a8c584ac 100644
--- a/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc
+++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc
diff --git a/data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc
index 5bb6a87e0..5bb6a87e0 100644
--- a/data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc
+++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc
diff --git a/data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc
index f7d22a5ed..f7d22a5ed 100644
--- a/data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc
+++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc
diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
index eacee4cf3..eacee4cf3 100644
--- a/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc
+++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
diff --git a/data/maps/events/BattleFrontier_BattlePyramidLobby.inc b/data/maps/BattleFrontier_BattlePyramidLobby/events.inc
index 28b5f5c61..28b5f5c61 100644
--- a/data/maps/events/BattleFrontier_BattlePyramidLobby.inc
+++ b/data/maps/BattleFrontier_BattlePyramidLobby/events.inc
diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
index 07b9fee47..07b9fee47 100644
--- a/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc
+++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
diff --git a/data/maps/events/BattleFrontier_BattlePyramidTop.inc b/data/maps/BattleFrontier_BattlePyramidTop/events.inc
index f724f4f9f..f724f4f9f 100644
--- a/data/maps/events/BattleFrontier_BattlePyramidTop.inc
+++ b/data/maps/BattleFrontier_BattlePyramidTop/events.inc
diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
index 886b3fe01..886b3fe01 100644
--- a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc
+++ b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
diff --git a/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc
index 0bc8d0434..0bc8d0434 100644
--- a/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc
diff --git a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
index f684e215d..f684e215d 100644
--- a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
diff --git a/data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc
index f97d8ad0c..f97d8ad0c 100644
--- a/data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc
diff --git a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
index d1b07451c..d1b07451c 100644
--- a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
diff --git a/data/maps/events/BattleFrontier_BattleTowerCorridor.inc b/data/maps/BattleFrontier_BattleTowerCorridor/events.inc
index 23f3377f3..23f3377f3 100644
--- a/data/maps/events/BattleFrontier_BattleTowerCorridor.inc
+++ b/data/maps/BattleFrontier_BattleTowerCorridor/events.inc
diff --git a/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc b/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc
index 9ff6bbc59..9ff6bbc59 100644
--- a/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc
+++ b/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc
diff --git a/data/maps/events/BattleFrontier_BattleTowerCorridor2.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc
index 9dce5da52..9dce5da52 100644
--- a/data/maps/events/BattleFrontier_BattleTowerCorridor2.inc
+++ b/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc
diff --git a/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc
index 36cf93ada..36cf93ada 100644
--- a/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc
+++ b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc
diff --git a/data/maps/events/BattleFrontier_BattleTowerElevator.inc b/data/maps/BattleFrontier_BattleTowerElevator/events.inc
index 321fc90e3..321fc90e3 100644
--- a/data/maps/events/BattleFrontier_BattleTowerElevator.inc
+++ b/data/maps/BattleFrontier_BattleTowerElevator/events.inc
diff --git a/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc
index 248c1f9ca..248c1f9ca 100644
--- a/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc
+++ b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc
diff --git a/data/maps/events/BattleFrontier_BattleTowerLobby.inc b/data/maps/BattleFrontier_BattleTowerLobby/events.inc
index 86e159b63..86e159b63 100644
--- a/data/maps/events/BattleFrontier_BattleTowerLobby.inc
+++ b/data/maps/BattleFrontier_BattleTowerLobby/events.inc
diff --git a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
index 478d61656..478d61656 100644
--- a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc
+++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
diff --git a/data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc
index 0c730f37d..0c730f37d 100644
--- a/data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc
+++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc
diff --git a/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
index a2f003b85..a2f003b85 100644
--- a/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc
+++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
diff --git a/data/maps/events/BattleFrontier_Lounge1.inc b/data/maps/BattleFrontier_Lounge1/events.inc
index b6c6ecdd0..b6c6ecdd0 100644
--- a/data/maps/events/BattleFrontier_Lounge1.inc
+++ b/data/maps/BattleFrontier_Lounge1/events.inc
diff --git a/data/scripts/maps/BattleFrontier_Lounge1.inc b/data/maps/BattleFrontier_Lounge1/scripts.inc
index ba8ca0cb6..ba8ca0cb6 100644
--- a/data/scripts/maps/BattleFrontier_Lounge1.inc
+++ b/data/maps/BattleFrontier_Lounge1/scripts.inc
diff --git a/data/maps/events/BattleFrontier_Lounge2.inc b/data/maps/BattleFrontier_Lounge2/events.inc
index 0616573bd..0616573bd 100644
--- a/data/maps/events/BattleFrontier_Lounge2.inc
+++ b/data/maps/BattleFrontier_Lounge2/events.inc
diff --git a/data/scripts/maps/BattleFrontier_Lounge2.inc b/data/maps/BattleFrontier_Lounge2/scripts.inc
index bbb298b5b..bbb298b5b 100644
--- a/data/scripts/maps/BattleFrontier_Lounge2.inc
+++ b/data/maps/BattleFrontier_Lounge2/scripts.inc
diff --git a/data/maps/events/BattleFrontier_Lounge3.inc b/data/maps/BattleFrontier_Lounge3/events.inc
index dbaa20fe1..dbaa20fe1 100644
--- a/data/maps/events/BattleFrontier_Lounge3.inc
+++ b/data/maps/BattleFrontier_Lounge3/events.inc
diff --git a/data/scripts/maps/BattleFrontier_Lounge3.inc b/data/maps/BattleFrontier_Lounge3/scripts.inc
index 2638541b2..2638541b2 100644
--- a/data/scripts/maps/BattleFrontier_Lounge3.inc
+++ b/data/maps/BattleFrontier_Lounge3/scripts.inc
diff --git a/data/maps/events/BattleFrontier_Lounge4.inc b/data/maps/BattleFrontier_Lounge4/events.inc
index 613adfae2..613adfae2 100644
--- a/data/maps/events/BattleFrontier_Lounge4.inc
+++ b/data/maps/BattleFrontier_Lounge4/events.inc
diff --git a/data/scripts/maps/BattleFrontier_Lounge4.inc b/data/maps/BattleFrontier_Lounge4/scripts.inc
index 1108ceee7..1108ceee7 100644
--- a/data/scripts/maps/BattleFrontier_Lounge4.inc
+++ b/data/maps/BattleFrontier_Lounge4/scripts.inc
diff --git a/data/maps/events/BattleFrontier_Lounge5.inc b/data/maps/BattleFrontier_Lounge5/events.inc
index 0224ae0a9..0224ae0a9 100644
--- a/data/maps/events/BattleFrontier_Lounge5.inc
+++ b/data/maps/BattleFrontier_Lounge5/events.inc
diff --git a/data/scripts/maps/BattleFrontier_Lounge5.inc b/data/maps/BattleFrontier_Lounge5/scripts.inc
index bb1feceec..bb1feceec 100644
--- a/data/scripts/maps/BattleFrontier_Lounge5.inc
+++ b/data/maps/BattleFrontier_Lounge5/scripts.inc
diff --git a/data/maps/events/BattleFrontier_Lounge6.inc b/data/maps/BattleFrontier_Lounge6/events.inc
index 092be452b..092be452b 100644
--- a/data/maps/events/BattleFrontier_Lounge6.inc
+++ b/data/maps/BattleFrontier_Lounge6/events.inc
diff --git a/data/scripts/maps/BattleFrontier_Lounge6.inc b/data/maps/BattleFrontier_Lounge6/scripts.inc
index c779e7c76..c779e7c76 100644
--- a/data/scripts/maps/BattleFrontier_Lounge6.inc
+++ b/data/maps/BattleFrontier_Lounge6/scripts.inc
diff --git a/data/maps/events/BattleFrontier_Lounge7.inc b/data/maps/BattleFrontier_Lounge7/events.inc
index c5490d6c9..c5490d6c9 100644
--- a/data/maps/events/BattleFrontier_Lounge7.inc
+++ b/data/maps/BattleFrontier_Lounge7/events.inc
diff --git a/data/scripts/maps/BattleFrontier_Lounge7.inc b/data/maps/BattleFrontier_Lounge7/scripts.inc
index 0b810d4f7..0b810d4f7 100644
--- a/data/scripts/maps/BattleFrontier_Lounge7.inc
+++ b/data/maps/BattleFrontier_Lounge7/scripts.inc
diff --git a/data/maps/events/BattleFrontier_Lounge8.inc b/data/maps/BattleFrontier_Lounge8/events.inc
index 116cc007f..116cc007f 100644
--- a/data/maps/events/BattleFrontier_Lounge8.inc
+++ b/data/maps/BattleFrontier_Lounge8/events.inc
diff --git a/data/scripts/maps/BattleFrontier_Lounge8.inc b/data/maps/BattleFrontier_Lounge8/scripts.inc
index 35f83baff..35f83baff 100644
--- a/data/scripts/maps/BattleFrontier_Lounge8.inc
+++ b/data/maps/BattleFrontier_Lounge8/scripts.inc
diff --git a/data/maps/events/BattleFrontier_Lounge9.inc b/data/maps/BattleFrontier_Lounge9/events.inc
index 6500ab66a..6500ab66a 100644
--- a/data/maps/events/BattleFrontier_Lounge9.inc
+++ b/data/maps/BattleFrontier_Lounge9/events.inc
diff --git a/data/scripts/maps/BattleFrontier_Lounge9.inc b/data/maps/BattleFrontier_Lounge9/scripts.inc
index cba75ee77..cba75ee77 100644
--- a/data/scripts/maps/BattleFrontier_Lounge9.inc
+++ b/data/maps/BattleFrontier_Lounge9/scripts.inc
diff --git a/data/maps/events/BattleFrontier_Mart.inc b/data/maps/BattleFrontier_Mart/events.inc
index 669945b99..669945b99 100644
--- a/data/maps/events/BattleFrontier_Mart.inc
+++ b/data/maps/BattleFrontier_Mart/events.inc
diff --git a/data/scripts/maps/BattleFrontier_Mart.inc b/data/maps/BattleFrontier_Mart/scripts.inc
index 0b7f5b767..0b7f5b767 100644
--- a/data/scripts/maps/BattleFrontier_Mart.inc
+++ b/data/maps/BattleFrontier_Mart/scripts.inc
diff --git a/data/maps/events/BattleFrontier_OutsideEast.inc b/data/maps/BattleFrontier_OutsideEast/events.inc
index 37fa6e7bd..37fa6e7bd 100644
--- a/data/maps/events/BattleFrontier_OutsideEast.inc
+++ b/data/maps/BattleFrontier_OutsideEast/events.inc
diff --git a/data/scripts/maps/BattleFrontier_OutsideEast.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc
index dff56322a..dff56322a 100644
--- a/data/scripts/maps/BattleFrontier_OutsideEast.inc
+++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc
diff --git a/data/maps/events/BattleFrontier_OutsideWest.inc b/data/maps/BattleFrontier_OutsideWest/events.inc
index 643e26e2e..643e26e2e 100644
--- a/data/maps/events/BattleFrontier_OutsideWest.inc
+++ b/data/maps/BattleFrontier_OutsideWest/events.inc
diff --git a/data/scripts/maps/BattleFrontier_OutsideWest.inc b/data/maps/BattleFrontier_OutsideWest/scripts.inc
index bd9d508dd..bd9d508dd 100644
--- a/data/scripts/maps/BattleFrontier_OutsideWest.inc
+++ b/data/maps/BattleFrontier_OutsideWest/scripts.inc
diff --git a/data/maps/events/BattleFrontier_PokemonCenter_1F.inc b/data/maps/BattleFrontier_PokemonCenter_1F/events.inc
index ba07ed15c..ba07ed15c 100644
--- a/data/maps/events/BattleFrontier_PokemonCenter_1F.inc
+++ b/data/maps/BattleFrontier_PokemonCenter_1F/events.inc
diff --git a/data/scripts/maps/BattleFrontier_PokemonCenter_1F.inc b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc
index 23818d64c..23818d64c 100644
--- a/data/scripts/maps/BattleFrontier_PokemonCenter_1F.inc
+++ b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc
diff --git a/data/maps/events/BattleFrontier_PokemonCenter_2F.inc b/data/maps/BattleFrontier_PokemonCenter_2F/events.inc
index bb5bb6119..bb5bb6119 100644
--- a/data/maps/events/BattleFrontier_PokemonCenter_2F.inc
+++ b/data/maps/BattleFrontier_PokemonCenter_2F/events.inc
diff --git a/data/scripts/maps/BattleFrontier_PokemonCenter_2F.inc b/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc
index 7d3c3a2f1..7d3c3a2f1 100644
--- a/data/scripts/maps/BattleFrontier_PokemonCenter_2F.inc
+++ b/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/events/BattleFrontier_RankingHall.inc b/data/maps/BattleFrontier_RankingHall/events.inc
index 239c372c6..239c372c6 100644
--- a/data/maps/events/BattleFrontier_RankingHall.inc
+++ b/data/maps/BattleFrontier_RankingHall/events.inc
diff --git a/data/scripts/maps/BattleFrontier_RankingHall.inc b/data/maps/BattleFrontier_RankingHall/scripts.inc
index e469024e9..e469024e9 100644
--- a/data/scripts/maps/BattleFrontier_RankingHall.inc
+++ b/data/maps/BattleFrontier_RankingHall/scripts.inc
diff --git a/data/maps/events/BattleFrontier_ReceptionGate.inc b/data/maps/BattleFrontier_ReceptionGate/events.inc
index 34db359fc..34db359fc 100644
--- a/data/maps/events/BattleFrontier_ReceptionGate.inc
+++ b/data/maps/BattleFrontier_ReceptionGate/events.inc
diff --git a/data/scripts/maps/BattleFrontier_ReceptionGate.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc
index ec38c3e9d..ec38c3e9d 100644
--- a/data/scripts/maps/BattleFrontier_ReceptionGate.inc
+++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc
diff --git a/data/maps/events/BattleFrontier_ScottsHouse.inc b/data/maps/BattleFrontier_ScottsHouse/events.inc
index 6e3de083c..6e3de083c 100644
--- a/data/maps/events/BattleFrontier_ScottsHouse.inc
+++ b/data/maps/BattleFrontier_ScottsHouse/events.inc
diff --git a/data/scripts/maps/BattleFrontier_ScottsHouse.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc
index 5be72b9b5..5be72b9b5 100644
--- a/data/scripts/maps/BattleFrontier_ScottsHouse.inc
+++ b/data/maps/BattleFrontier_ScottsHouse/scripts.inc
diff --git a/data/maps/events/BattlePyramidSquare01.inc b/data/maps/BattlePyramidSquare01/events.inc
index 677499152..677499152 100644
--- a/data/maps/events/BattlePyramidSquare01.inc
+++ b/data/maps/BattlePyramidSquare01/events.inc
diff --git a/data/scripts/maps/BattlePyramidSquare01.inc b/data/maps/BattlePyramidSquare01/scripts.inc
index c51e49ba7..c51e49ba7 100644
--- a/data/scripts/maps/BattlePyramidSquare01.inc
+++ b/data/maps/BattlePyramidSquare01/scripts.inc
diff --git a/data/maps/events/BattlePyramidSquare02.inc b/data/maps/BattlePyramidSquare02/events.inc
index 1133979ee..1133979ee 100644
--- a/data/maps/events/BattlePyramidSquare02.inc
+++ b/data/maps/BattlePyramidSquare02/events.inc
diff --git a/data/scripts/maps/BattlePyramidSquare02.inc b/data/maps/BattlePyramidSquare02/scripts.inc
index a694b03bf..a694b03bf 100644
--- a/data/scripts/maps/BattlePyramidSquare02.inc
+++ b/data/maps/BattlePyramidSquare02/scripts.inc
diff --git a/data/maps/events/BattlePyramidSquare03.inc b/data/maps/BattlePyramidSquare03/events.inc
index 95fdb77bc..95fdb77bc 100644
--- a/data/maps/events/BattlePyramidSquare03.inc
+++ b/data/maps/BattlePyramidSquare03/events.inc
diff --git a/data/scripts/maps/BattlePyramidSquare03.inc b/data/maps/BattlePyramidSquare03/scripts.inc
index 229dd5a28..229dd5a28 100644
--- a/data/scripts/maps/BattlePyramidSquare03.inc
+++ b/data/maps/BattlePyramidSquare03/scripts.inc
diff --git a/data/maps/events/BattlePyramidSquare04.inc b/data/maps/BattlePyramidSquare04/events.inc
index 3b19c7f09..3b19c7f09 100644
--- a/data/maps/events/BattlePyramidSquare04.inc
+++ b/data/maps/BattlePyramidSquare04/events.inc
diff --git a/data/scripts/maps/BattlePyramidSquare04.inc b/data/maps/BattlePyramidSquare04/scripts.inc
index a231965b5..a231965b5 100644
--- a/data/scripts/maps/BattlePyramidSquare04.inc
+++ b/data/maps/BattlePyramidSquare04/scripts.inc
diff --git a/data/maps/events/BattlePyramidSquare05.inc b/data/maps/BattlePyramidSquare05/events.inc
index 17f6aab60..17f6aab60 100644
--- a/data/maps/events/BattlePyramidSquare05.inc
+++ b/data/maps/BattlePyramidSquare05/events.inc
diff --git a/data/scripts/maps/BattlePyramidSquare05.inc b/data/maps/BattlePyramidSquare05/scripts.inc
index e4670f78c..e4670f78c 100644
--- a/data/scripts/maps/BattlePyramidSquare05.inc
+++ b/data/maps/BattlePyramidSquare05/scripts.inc
diff --git a/data/maps/events/BattlePyramidSquare06.inc b/data/maps/BattlePyramidSquare06/events.inc
index 6ae39b52f..6ae39b52f 100644
--- a/data/maps/events/BattlePyramidSquare06.inc
+++ b/data/maps/BattlePyramidSquare06/events.inc
diff --git a/data/scripts/maps/BattlePyramidSquare06.inc b/data/maps/BattlePyramidSquare06/scripts.inc
index 6c0d38e41..6c0d38e41 100644
--- a/data/scripts/maps/BattlePyramidSquare06.inc
+++ b/data/maps/BattlePyramidSquare06/scripts.inc
diff --git a/data/maps/events/BattlePyramidSquare07.inc b/data/maps/BattlePyramidSquare07/events.inc
index 788c5e40c..788c5e40c 100644
--- a/data/maps/events/BattlePyramidSquare07.inc
+++ b/data/maps/BattlePyramidSquare07/events.inc
diff --git a/data/scripts/maps/BattlePyramidSquare07.inc b/data/maps/BattlePyramidSquare07/scripts.inc
index 8603a6916..8603a6916 100644
--- a/data/scripts/maps/BattlePyramidSquare07.inc
+++ b/data/maps/BattlePyramidSquare07/scripts.inc
diff --git a/data/maps/events/BattlePyramidSquare08.inc b/data/maps/BattlePyramidSquare08/events.inc
index 780fab9ed..780fab9ed 100644
--- a/data/maps/events/BattlePyramidSquare08.inc
+++ b/data/maps/BattlePyramidSquare08/events.inc
diff --git a/data/scripts/maps/BattlePyramidSquare08.inc b/data/maps/BattlePyramidSquare08/scripts.inc
index 68a055f0e..68a055f0e 100644
--- a/data/scripts/maps/BattlePyramidSquare08.inc
+++ b/data/maps/BattlePyramidSquare08/scripts.inc
diff --git a/data/maps/events/BattlePyramidSquare09.inc b/data/maps/BattlePyramidSquare09/events.inc
index 569059af5..569059af5 100644
--- a/data/maps/events/BattlePyramidSquare09.inc
+++ b/data/maps/BattlePyramidSquare09/events.inc
diff --git a/data/scripts/maps/BattlePyramidSquare09.inc b/data/maps/BattlePyramidSquare09/scripts.inc
index e93734988..e93734988 100644
--- a/data/scripts/maps/BattlePyramidSquare09.inc
+++ b/data/maps/BattlePyramidSquare09/scripts.inc
diff --git a/data/maps/events/BattlePyramidSquare10.inc b/data/maps/BattlePyramidSquare10/events.inc
index ae3c4f88e..ae3c4f88e 100644
--- a/data/maps/events/BattlePyramidSquare10.inc
+++ b/data/maps/BattlePyramidSquare10/events.inc
diff --git a/data/scripts/maps/BattlePyramidSquare10.inc b/data/maps/BattlePyramidSquare10/scripts.inc
index 412e608e7..412e608e7 100644
--- a/data/scripts/maps/BattlePyramidSquare10.inc
+++ b/data/maps/BattlePyramidSquare10/scripts.inc
diff --git a/data/maps/events/BattlePyramidSquare11.inc b/data/maps/BattlePyramidSquare11/events.inc
index 0389ee141..0389ee141 100644
--- a/data/maps/events/BattlePyramidSquare11.inc
+++ b/data/maps/BattlePyramidSquare11/events.inc
diff --git a/data/scripts/maps/BattlePyramidSquare11.inc b/data/maps/BattlePyramidSquare11/scripts.inc
index 3b82fb925..3b82fb925 100644
--- a/data/scripts/maps/BattlePyramidSquare11.inc
+++ b/data/maps/BattlePyramidSquare11/scripts.inc
diff --git a/data/maps/events/BattlePyramidSquare12.inc b/data/maps/BattlePyramidSquare12/events.inc
index db27c6c64..db27c6c64 100644
--- a/data/maps/events/BattlePyramidSquare12.inc
+++ b/data/maps/BattlePyramidSquare12/events.inc
diff --git a/data/scripts/maps/BattlePyramidSquare12.inc b/data/maps/BattlePyramidSquare12/scripts.inc
index 87a38213b..87a38213b 100644
--- a/data/scripts/maps/BattlePyramidSquare12.inc
+++ b/data/maps/BattlePyramidSquare12/scripts.inc
diff --git a/data/maps/events/BattlePyramidSquare13.inc b/data/maps/BattlePyramidSquare13/events.inc
index 12ac8ffe7..12ac8ffe7 100644
--- a/data/maps/events/BattlePyramidSquare13.inc
+++ b/data/maps/BattlePyramidSquare13/events.inc
diff --git a/data/scripts/maps/BattlePyramidSquare13.inc b/data/maps/BattlePyramidSquare13/scripts.inc
index 188109305..188109305 100644
--- a/data/scripts/maps/BattlePyramidSquare13.inc
+++ b/data/maps/BattlePyramidSquare13/scripts.inc
diff --git a/data/maps/events/BattlePyramidSquare14.inc b/data/maps/BattlePyramidSquare14/events.inc
index c63fabee3..c63fabee3 100644
--- a/data/maps/events/BattlePyramidSquare14.inc
+++ b/data/maps/BattlePyramidSquare14/events.inc
diff --git a/data/scripts/maps/BattlePyramidSquare14.inc b/data/maps/BattlePyramidSquare14/scripts.inc
index 5ae39cb8a..5ae39cb8a 100644
--- a/data/scripts/maps/BattlePyramidSquare14.inc
+++ b/data/maps/BattlePyramidSquare14/scripts.inc
diff --git a/data/maps/events/BattlePyramidSquare15.inc b/data/maps/BattlePyramidSquare15/events.inc
index f2332f18b..f2332f18b 100644
--- a/data/maps/events/BattlePyramidSquare15.inc
+++ b/data/maps/BattlePyramidSquare15/events.inc
diff --git a/data/scripts/maps/BattlePyramidSquare15.inc b/data/maps/BattlePyramidSquare15/scripts.inc
index f1b7782d7..f1b7782d7 100644
--- a/data/scripts/maps/BattlePyramidSquare15.inc
+++ b/data/maps/BattlePyramidSquare15/scripts.inc
diff --git a/data/maps/events/BattlePyramidSquare16.inc b/data/maps/BattlePyramidSquare16/events.inc
index 38d398b5b..38d398b5b 100644
--- a/data/maps/events/BattlePyramidSquare16.inc
+++ b/data/maps/BattlePyramidSquare16/events.inc
diff --git a/data/scripts/maps/BattlePyramidSquare16.inc b/data/maps/BattlePyramidSquare16/scripts.inc
index 9308930d1..9308930d1 100644
--- a/data/scripts/maps/BattlePyramidSquare16.inc
+++ b/data/maps/BattlePyramidSquare16/scripts.inc
diff --git a/data/maps/events/BirthIsland_Exterior.inc b/data/maps/BirthIsland_Exterior/events.inc
index 86f4d43cb..86f4d43cb 100644
--- a/data/maps/events/BirthIsland_Exterior.inc
+++ b/data/maps/BirthIsland_Exterior/events.inc
diff --git a/data/scripts/maps/BirthIsland_Exterior.inc b/data/maps/BirthIsland_Exterior/scripts.inc
index b2427e95d..b2427e95d 100644
--- a/data/scripts/maps/BirthIsland_Exterior.inc
+++ b/data/maps/BirthIsland_Exterior/scripts.inc
diff --git a/data/maps/events/BirthIsland_Harbor.inc b/data/maps/BirthIsland_Harbor/events.inc
index f5c38358d..f5c38358d 100644
--- a/data/maps/events/BirthIsland_Harbor.inc
+++ b/data/maps/BirthIsland_Harbor/events.inc
diff --git a/data/scripts/maps/BirthIsland_Harbor.inc b/data/maps/BirthIsland_Harbor/scripts.inc
index fe939172d..fe939172d 100644
--- a/data/scripts/maps/BirthIsland_Harbor.inc
+++ b/data/maps/BirthIsland_Harbor/scripts.inc
diff --git a/data/maps/events/CaveOfOrigin_1F.inc b/data/maps/CaveOfOrigin_1F/events.inc
index bdc629846..bdc629846 100644
--- a/data/maps/events/CaveOfOrigin_1F.inc
+++ b/data/maps/CaveOfOrigin_1F/events.inc
diff --git a/data/scripts/maps/CaveOfOrigin_1F.inc b/data/maps/CaveOfOrigin_1F/scripts.inc
index 42c78d4b7..42c78d4b7 100644
--- a/data/scripts/maps/CaveOfOrigin_1F.inc
+++ b/data/maps/CaveOfOrigin_1F/scripts.inc
diff --git a/data/maps/events/CaveOfOrigin_B1F.inc b/data/maps/CaveOfOrigin_B1F/events.inc
index 72a2c6210..72a2c6210 100644
--- a/data/maps/events/CaveOfOrigin_B1F.inc
+++ b/data/maps/CaveOfOrigin_B1F/events.inc
diff --git a/data/scripts/maps/CaveOfOrigin_B1F.inc b/data/maps/CaveOfOrigin_B1F/scripts.inc
index 5ac3ec64a..5ac3ec64a 100644
--- a/data/scripts/maps/CaveOfOrigin_B1F.inc
+++ b/data/maps/CaveOfOrigin_B1F/scripts.inc
diff --git a/data/maps/events/CaveOfOrigin_Entrance.inc b/data/maps/CaveOfOrigin_Entrance/events.inc
index 5a5ad59f7..5a5ad59f7 100644
--- a/data/maps/events/CaveOfOrigin_Entrance.inc
+++ b/data/maps/CaveOfOrigin_Entrance/events.inc
diff --git a/data/scripts/maps/CaveOfOrigin_Entrance.inc b/data/maps/CaveOfOrigin_Entrance/scripts.inc
index 1a771ae82..1a771ae82 100644
--- a/data/scripts/maps/CaveOfOrigin_Entrance.inc
+++ b/data/maps/CaveOfOrigin_Entrance/scripts.inc
diff --git a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap1.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc
index c9eeaff22..c9eeaff22 100644
--- a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap1.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc
diff --git a/data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap1.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc
index 4b4240833..4b4240833 100644
--- a/data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap1.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc
diff --git a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap2.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc
index c8e9bbeeb..c8e9bbeeb 100644
--- a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap2.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc
diff --git a/data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap2.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc
index d73ff8231..d73ff8231 100644
--- a/data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap2.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc
diff --git a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap3.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc
index 953eef558..953eef558 100644
--- a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap3.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc
diff --git a/data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap3.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc
index 7f4fb2ff1..7f4fb2ff1 100644
--- a/data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap3.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc
diff --git a/data/maps/events/DesertRuins.inc b/data/maps/DesertRuins/events.inc
index b7ccd35b0..b7ccd35b0 100644
--- a/data/maps/events/DesertRuins.inc
+++ b/data/maps/DesertRuins/events.inc
diff --git a/data/scripts/maps/DesertRuins.inc b/data/maps/DesertRuins/scripts.inc
index 9137902f2..9137902f2 100644
--- a/data/scripts/maps/DesertRuins.inc
+++ b/data/maps/DesertRuins/scripts.inc
diff --git a/data/maps/events/DesertUnderpass.inc b/data/maps/DesertUnderpass/events.inc
index 05fb939a0..05fb939a0 100644
--- a/data/maps/events/DesertUnderpass.inc
+++ b/data/maps/DesertUnderpass/events.inc
diff --git a/data/scripts/maps/DesertUnderpass.inc b/data/maps/DesertUnderpass/scripts.inc
index 486bd2577..486bd2577 100644
--- a/data/scripts/maps/DesertUnderpass.inc
+++ b/data/maps/DesertUnderpass/scripts.inc
diff --git a/data/maps/events/DewfordTown.inc b/data/maps/DewfordTown/events.inc
index c96b4c95e..c96b4c95e 100644
--- a/data/maps/events/DewfordTown.inc
+++ b/data/maps/DewfordTown/events.inc
diff --git a/data/scripts/maps/DewfordTown.inc b/data/maps/DewfordTown/scripts.inc
index 157c1f4d5..157c1f4d5 100644
--- a/data/scripts/maps/DewfordTown.inc
+++ b/data/maps/DewfordTown/scripts.inc
diff --git a/data/maps/events/DewfordTown_Gym.inc b/data/maps/DewfordTown_Gym/events.inc
index 11f5d5a92..11f5d5a92 100644
--- a/data/maps/events/DewfordTown_Gym.inc
+++ b/data/maps/DewfordTown_Gym/events.inc
diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/maps/DewfordTown_Gym/scripts.inc
index 6acd67792..6acd67792 100644
--- a/data/scripts/maps/DewfordTown_Gym.inc
+++ b/data/maps/DewfordTown_Gym/scripts.inc
diff --git a/data/maps/events/DewfordTown_Hall.inc b/data/maps/DewfordTown_Hall/events.inc
index e12a02a3c..e12a02a3c 100644
--- a/data/maps/events/DewfordTown_Hall.inc
+++ b/data/maps/DewfordTown_Hall/events.inc
diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/maps/DewfordTown_Hall/scripts.inc
index 37122a640..37122a640 100644
--- a/data/scripts/maps/DewfordTown_Hall.inc
+++ b/data/maps/DewfordTown_Hall/scripts.inc
diff --git a/data/maps/events/DewfordTown_House1.inc b/data/maps/DewfordTown_House1/events.inc
index 849bb0244..849bb0244 100644
--- a/data/maps/events/DewfordTown_House1.inc
+++ b/data/maps/DewfordTown_House1/events.inc
diff --git a/data/scripts/maps/DewfordTown_House1.inc b/data/maps/DewfordTown_House1/scripts.inc
index 59c490d81..59c490d81 100644
--- a/data/scripts/maps/DewfordTown_House1.inc
+++ b/data/maps/DewfordTown_House1/scripts.inc
diff --git a/data/maps/events/DewfordTown_House2.inc b/data/maps/DewfordTown_House2/events.inc
index 8aec9176b..8aec9176b 100644
--- a/data/maps/events/DewfordTown_House2.inc
+++ b/data/maps/DewfordTown_House2/events.inc
diff --git a/data/scripts/maps/DewfordTown_House2.inc b/data/maps/DewfordTown_House2/scripts.inc
index 1805164af..1805164af 100644
--- a/data/scripts/maps/DewfordTown_House2.inc
+++ b/data/maps/DewfordTown_House2/scripts.inc
diff --git a/data/maps/events/DewfordTown_PokemonCenter_1F.inc b/data/maps/DewfordTown_PokemonCenter_1F/events.inc
index aad05249c..aad05249c 100644
--- a/data/maps/events/DewfordTown_PokemonCenter_1F.inc
+++ b/data/maps/DewfordTown_PokemonCenter_1F/events.inc
diff --git a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc
index 15a1c81b9..15a1c81b9 100644
--- a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc
+++ b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc
diff --git a/data/maps/events/DewfordTown_PokemonCenter_2F.inc b/data/maps/DewfordTown_PokemonCenter_2F/events.inc
index 9c739974b..9c739974b 100644
--- a/data/maps/events/DewfordTown_PokemonCenter_2F.inc
+++ b/data/maps/DewfordTown_PokemonCenter_2F/events.inc
diff --git a/data/scripts/maps/DewfordTown_PokemonCenter_2F.inc b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc
index f2a30ecd2..f2a30ecd2 100644
--- a/data/scripts/maps/DewfordTown_PokemonCenter_2F.inc
+++ b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/events/DoubleBattleColosseum.inc b/data/maps/DoubleBattleColosseum/events.inc
index f28e9e3e1..f28e9e3e1 100644
--- a/data/maps/events/DoubleBattleColosseum.inc
+++ b/data/maps/DoubleBattleColosseum/events.inc
diff --git a/data/scripts/maps/DoubleBattleColosseum.inc b/data/maps/DoubleBattleColosseum/scripts.inc
index ac64377ae..ac64377ae 100644
--- a/data/scripts/maps/DoubleBattleColosseum.inc
+++ b/data/maps/DoubleBattleColosseum/scripts.inc
diff --git a/data/maps/events/EverGrandeCity.inc b/data/maps/EverGrandeCity/events.inc
index b8ca9eea4..b8ca9eea4 100644
--- a/data/maps/events/EverGrandeCity.inc
+++ b/data/maps/EverGrandeCity/events.inc
diff --git a/data/scripts/maps/EverGrandeCity.inc b/data/maps/EverGrandeCity/scripts.inc
index 178621217..178621217 100644
--- a/data/scripts/maps/EverGrandeCity.inc
+++ b/data/maps/EverGrandeCity/scripts.inc
diff --git a/data/maps/events/EverGrandeCity_ChampionsRoom.inc b/data/maps/EverGrandeCity_ChampionsRoom/events.inc
index 6226fe527..6226fe527 100644
--- a/data/maps/events/EverGrandeCity_ChampionsRoom.inc
+++ b/data/maps/EverGrandeCity_ChampionsRoom/events.inc
diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
index 3e68f4fed..3e68f4fed 100644
--- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc
+++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
diff --git a/data/maps/events/EverGrandeCity_DrakesRoom.inc b/data/maps/EverGrandeCity_DrakesRoom/events.inc
index 56eda4374..56eda4374 100644
--- a/data/maps/events/EverGrandeCity_DrakesRoom.inc
+++ b/data/maps/EverGrandeCity_DrakesRoom/events.inc
diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc
index 4c90417af..4c90417af 100644
--- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc
+++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc
diff --git a/data/maps/events/EverGrandeCity_GlaciasRoom.inc b/data/maps/EverGrandeCity_GlaciasRoom/events.inc
index c8d85fd98..c8d85fd98 100644
--- a/data/maps/events/EverGrandeCity_GlaciasRoom.inc
+++ b/data/maps/EverGrandeCity_GlaciasRoom/events.inc
diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc
index f1d846f03..f1d846f03 100644
--- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc
+++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc
diff --git a/data/maps/events/EverGrandeCity_Hall1.inc b/data/maps/EverGrandeCity_Hall1/events.inc
index 3351b42e0..3351b42e0 100644
--- a/data/maps/events/EverGrandeCity_Hall1.inc
+++ b/data/maps/EverGrandeCity_Hall1/events.inc
diff --git a/data/scripts/maps/EverGrandeCity_Hall1.inc b/data/maps/EverGrandeCity_Hall1/scripts.inc
index 960918662..960918662 100644
--- a/data/scripts/maps/EverGrandeCity_Hall1.inc
+++ b/data/maps/EverGrandeCity_Hall1/scripts.inc
diff --git a/data/maps/events/EverGrandeCity_Hall2.inc b/data/maps/EverGrandeCity_Hall2/events.inc
index e3eacab10..e3eacab10 100644
--- a/data/maps/events/EverGrandeCity_Hall2.inc
+++ b/data/maps/EverGrandeCity_Hall2/events.inc
diff --git a/data/scripts/maps/EverGrandeCity_Hall2.inc b/data/maps/EverGrandeCity_Hall2/scripts.inc
index 1d76e3695..1d76e3695 100644
--- a/data/scripts/maps/EverGrandeCity_Hall2.inc
+++ b/data/maps/EverGrandeCity_Hall2/scripts.inc
diff --git a/data/maps/events/EverGrandeCity_Hall3.inc b/data/maps/EverGrandeCity_Hall3/events.inc
index e44182b4f..e44182b4f 100644
--- a/data/maps/events/EverGrandeCity_Hall3.inc
+++ b/data/maps/EverGrandeCity_Hall3/events.inc
diff --git a/data/scripts/maps/EverGrandeCity_Hall3.inc b/data/maps/EverGrandeCity_Hall3/scripts.inc
index a100487f5..a100487f5 100644
--- a/data/scripts/maps/EverGrandeCity_Hall3.inc
+++ b/data/maps/EverGrandeCity_Hall3/scripts.inc
diff --git a/data/maps/events/EverGrandeCity_Hall4.inc b/data/maps/EverGrandeCity_Hall4/events.inc
index b2d011234..b2d011234 100644
--- a/data/maps/events/EverGrandeCity_Hall4.inc
+++ b/data/maps/EverGrandeCity_Hall4/events.inc
diff --git a/data/scripts/maps/EverGrandeCity_Hall4.inc b/data/maps/EverGrandeCity_Hall4/scripts.inc
index a7c730594..a7c730594 100644
--- a/data/scripts/maps/EverGrandeCity_Hall4.inc
+++ b/data/maps/EverGrandeCity_Hall4/scripts.inc
diff --git a/data/maps/events/EverGrandeCity_Hall5.inc b/data/maps/EverGrandeCity_Hall5/events.inc
index 687920b71..687920b71 100644
--- a/data/maps/events/EverGrandeCity_Hall5.inc
+++ b/data/maps/EverGrandeCity_Hall5/events.inc
diff --git a/data/scripts/maps/EverGrandeCity_Hall5.inc b/data/maps/EverGrandeCity_Hall5/scripts.inc
index 9ca9991e4..9ca9991e4 100644
--- a/data/scripts/maps/EverGrandeCity_Hall5.inc
+++ b/data/maps/EverGrandeCity_Hall5/scripts.inc
diff --git a/data/maps/events/EverGrandeCity_HallOfFame.inc b/data/maps/EverGrandeCity_HallOfFame/events.inc
index 50fc7fbdc..50fc7fbdc 100644
--- a/data/maps/events/EverGrandeCity_HallOfFame.inc
+++ b/data/maps/EverGrandeCity_HallOfFame/events.inc
diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc
index 60f0dd1ad..60f0dd1ad 100644
--- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc
+++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc
diff --git a/data/maps/events/EverGrandeCity_PhoebesRoom.inc b/data/maps/EverGrandeCity_PhoebesRoom/events.inc
index c9b5ef7fd..c9b5ef7fd 100644
--- a/data/maps/events/EverGrandeCity_PhoebesRoom.inc
+++ b/data/maps/EverGrandeCity_PhoebesRoom/events.inc
diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc
index 679e4f663..679e4f663 100644
--- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc
+++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc
diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc
index 1f7e26046..1f7e26046 100644
--- a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc
diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
index ed6e6a497..ed6e6a497 100644
--- a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc
index 98671f414..98671f414 100644
--- a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc
diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_2F.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc
index 09d382b2b..09d382b2b 100644
--- a/data/scripts/maps/EverGrandeCity_PokemonCenter_2F.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc
index 536dbf934..536dbf934 100644
--- a/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc
diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc
index f1a6ce17f..f1a6ce17f 100644
--- a/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc
diff --git a/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc
index a09e8ed31..a09e8ed31 100644
--- a/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc
diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague_2F.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc
index d3a77a051..d3a77a051 100644
--- a/data/scripts/maps/EverGrandeCity_PokemonLeague_2F.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc
diff --git a/data/maps/events/EverGrandeCity_SidneysRoom.inc b/data/maps/EverGrandeCity_SidneysRoom/events.inc
index 1823af7cd..1823af7cd 100644
--- a/data/maps/events/EverGrandeCity_SidneysRoom.inc
+++ b/data/maps/EverGrandeCity_SidneysRoom/events.inc
diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc
index b2db55e36..b2db55e36 100644
--- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc
+++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc
diff --git a/data/maps/events/FallarborTown.inc b/data/maps/FallarborTown/events.inc
index 91a98cc28..91a98cc28 100644
--- a/data/maps/events/FallarborTown.inc
+++ b/data/maps/FallarborTown/events.inc
diff --git a/data/scripts/maps/FallarborTown.inc b/data/maps/FallarborTown/scripts.inc
index 21cea72e1..21cea72e1 100644
--- a/data/scripts/maps/FallarborTown.inc
+++ b/data/maps/FallarborTown/scripts.inc
diff --git a/data/maps/events/FallarborTown_BattleTentBattleRoom.inc b/data/maps/FallarborTown_BattleTentBattleRoom/events.inc
index c4e35ebbb..c4e35ebbb 100644
--- a/data/maps/events/FallarborTown_BattleTentBattleRoom.inc
+++ b/data/maps/FallarborTown_BattleTentBattleRoom/events.inc
diff --git a/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
index e373ff5ad..e373ff5ad 100644
--- a/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc
+++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
diff --git a/data/maps/events/FallarborTown_BattleTentCorridor.inc b/data/maps/FallarborTown_BattleTentCorridor/events.inc
index 471ca66a3..471ca66a3 100644
--- a/data/maps/events/FallarborTown_BattleTentCorridor.inc
+++ b/data/maps/FallarborTown_BattleTentCorridor/events.inc
diff --git a/data/scripts/maps/FallarborTown_BattleTentCorridor.inc b/data/maps/FallarborTown_BattleTentCorridor/scripts.inc
index f1a144a14..f1a144a14 100644
--- a/data/scripts/maps/FallarborTown_BattleTentCorridor.inc
+++ b/data/maps/FallarborTown_BattleTentCorridor/scripts.inc
diff --git a/data/maps/events/FallarborTown_BattleTentLobby.inc b/data/maps/FallarborTown_BattleTentLobby/events.inc
index 570287ae3..570287ae3 100644
--- a/data/maps/events/FallarborTown_BattleTentLobby.inc
+++ b/data/maps/FallarborTown_BattleTentLobby/events.inc
diff --git a/data/scripts/maps/FallarborTown_BattleTentLobby.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc
index 00efa5394..00efa5394 100644
--- a/data/scripts/maps/FallarborTown_BattleTentLobby.inc
+++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc
diff --git a/data/maps/events/FallarborTown_House1.inc b/data/maps/FallarborTown_House1/events.inc
index 5c2323b74..5c2323b74 100644
--- a/data/maps/events/FallarborTown_House1.inc
+++ b/data/maps/FallarborTown_House1/events.inc
diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/maps/FallarborTown_House1/scripts.inc
index 47459f8d5..47459f8d5 100644
--- a/data/scripts/maps/FallarborTown_House1.inc
+++ b/data/maps/FallarborTown_House1/scripts.inc
diff --git a/data/maps/events/FallarborTown_House2.inc b/data/maps/FallarborTown_House2/events.inc
index 342e2e60b..342e2e60b 100644
--- a/data/maps/events/FallarborTown_House2.inc
+++ b/data/maps/FallarborTown_House2/events.inc
diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/maps/FallarborTown_House2/scripts.inc
index b78756e0a..b78756e0a 100644
--- a/data/scripts/maps/FallarborTown_House2.inc
+++ b/data/maps/FallarborTown_House2/scripts.inc
diff --git a/data/maps/events/FallarborTown_Mart.inc b/data/maps/FallarborTown_Mart/events.inc
index 6d7188c6a..6d7188c6a 100644
--- a/data/maps/events/FallarborTown_Mart.inc
+++ b/data/maps/FallarborTown_Mart/events.inc
diff --git a/data/scripts/maps/FallarborTown_Mart.inc b/data/maps/FallarborTown_Mart/scripts.inc
index dbaf33f4e..dbaf33f4e 100644
--- a/data/scripts/maps/FallarborTown_Mart.inc
+++ b/data/maps/FallarborTown_Mart/scripts.inc
diff --git a/data/maps/events/FallarborTown_PokemonCenter_1F.inc b/data/maps/FallarborTown_PokemonCenter_1F/events.inc
index 368190914..368190914 100644
--- a/data/maps/events/FallarborTown_PokemonCenter_1F.inc
+++ b/data/maps/FallarborTown_PokemonCenter_1F/events.inc
diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
index 15f5d2b9e..15f5d2b9e 100644
--- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc
+++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
diff --git a/data/maps/events/FallarborTown_PokemonCenter_2F.inc b/data/maps/FallarborTown_PokemonCenter_2F/events.inc
index 9162a2822..9162a2822 100644
--- a/data/maps/events/FallarborTown_PokemonCenter_2F.inc
+++ b/data/maps/FallarborTown_PokemonCenter_2F/events.inc
diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_2F.inc b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc
index 93482e860..93482e860 100644
--- a/data/scripts/maps/FallarborTown_PokemonCenter_2F.inc
+++ b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/events/FarawayIsland_Entrance.inc b/data/maps/FarawayIsland_Entrance/events.inc
index 8af15533b..8af15533b 100644
--- a/data/maps/events/FarawayIsland_Entrance.inc
+++ b/data/maps/FarawayIsland_Entrance/events.inc
diff --git a/data/scripts/maps/FarawayIsland_Entrance.inc b/data/maps/FarawayIsland_Entrance/scripts.inc
index 08331b33b..08331b33b 100644
--- a/data/scripts/maps/FarawayIsland_Entrance.inc
+++ b/data/maps/FarawayIsland_Entrance/scripts.inc
diff --git a/data/maps/events/FarawayIsland_Interior.inc b/data/maps/FarawayIsland_Interior/events.inc
index c2cd25b40..c2cd25b40 100644
--- a/data/maps/events/FarawayIsland_Interior.inc
+++ b/data/maps/FarawayIsland_Interior/events.inc
diff --git a/data/scripts/maps/FarawayIsland_Interior.inc b/data/maps/FarawayIsland_Interior/scripts.inc
index e7d67431d..e7d67431d 100644
--- a/data/scripts/maps/FarawayIsland_Interior.inc
+++ b/data/maps/FarawayIsland_Interior/scripts.inc
diff --git a/data/maps/events/FieryPath.inc b/data/maps/FieryPath/events.inc
index 37fecaf5e..37fecaf5e 100644
--- a/data/maps/events/FieryPath.inc
+++ b/data/maps/FieryPath/events.inc
diff --git a/data/scripts/maps/FieryPath.inc b/data/maps/FieryPath/scripts.inc
index a040a5327..a040a5327 100644
--- a/data/scripts/maps/FieryPath.inc
+++ b/data/maps/FieryPath/scripts.inc
diff --git a/data/maps/events/FortreeCity.inc b/data/maps/FortreeCity/events.inc
index c943e230d..c943e230d 100644
--- a/data/maps/events/FortreeCity.inc
+++ b/data/maps/FortreeCity/events.inc
diff --git a/data/scripts/maps/FortreeCity.inc b/data/maps/FortreeCity/scripts.inc
index 4a28a180b..4a28a180b 100644
--- a/data/scripts/maps/FortreeCity.inc
+++ b/data/maps/FortreeCity/scripts.inc
diff --git a/data/maps/events/FortreeCity_DecorationShop.inc b/data/maps/FortreeCity_DecorationShop/events.inc
index fe85e94d6..fe85e94d6 100644
--- a/data/maps/events/FortreeCity_DecorationShop.inc
+++ b/data/maps/FortreeCity_DecorationShop/events.inc
diff --git a/data/scripts/maps/FortreeCity_DecorationShop.inc b/data/maps/FortreeCity_DecorationShop/scripts.inc
index 2229ab702..2229ab702 100644
--- a/data/scripts/maps/FortreeCity_DecorationShop.inc
+++ b/data/maps/FortreeCity_DecorationShop/scripts.inc
diff --git a/data/maps/events/FortreeCity_Gym.inc b/data/maps/FortreeCity_Gym/events.inc
index 234c10b0c..234c10b0c 100644
--- a/data/maps/events/FortreeCity_Gym.inc
+++ b/data/maps/FortreeCity_Gym/events.inc
diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/maps/FortreeCity_Gym/scripts.inc
index 1b1100cf3..1b1100cf3 100644
--- a/data/scripts/maps/FortreeCity_Gym.inc
+++ b/data/maps/FortreeCity_Gym/scripts.inc
diff --git a/data/maps/events/FortreeCity_House1.inc b/data/maps/FortreeCity_House1/events.inc
index 99d34626c..99d34626c 100644
--- a/data/maps/events/FortreeCity_House1.inc
+++ b/data/maps/FortreeCity_House1/events.inc
diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/maps/FortreeCity_House1/scripts.inc
index 7e45bf87a..7e45bf87a 100644
--- a/data/scripts/maps/FortreeCity_House1.inc
+++ b/data/maps/FortreeCity_House1/scripts.inc
diff --git a/data/maps/events/FortreeCity_House2.inc b/data/maps/FortreeCity_House2/events.inc
index 2d78b2774..2d78b2774 100644
--- a/data/maps/events/FortreeCity_House2.inc
+++ b/data/maps/FortreeCity_House2/events.inc
diff --git a/data/scripts/maps/FortreeCity_House2.inc b/data/maps/FortreeCity_House2/scripts.inc
index 8f75b20d9..8f75b20d9 100644
--- a/data/scripts/maps/FortreeCity_House2.inc
+++ b/data/maps/FortreeCity_House2/scripts.inc
diff --git a/data/maps/events/FortreeCity_House3.inc b/data/maps/FortreeCity_House3/events.inc
index 54ac6ed6a..54ac6ed6a 100644
--- a/data/maps/events/FortreeCity_House3.inc
+++ b/data/maps/FortreeCity_House3/events.inc
diff --git a/data/scripts/maps/FortreeCity_House3.inc b/data/maps/FortreeCity_House3/scripts.inc
index 92b963811..92b963811 100644
--- a/data/scripts/maps/FortreeCity_House3.inc
+++ b/data/maps/FortreeCity_House3/scripts.inc
diff --git a/data/maps/events/FortreeCity_House4.inc b/data/maps/FortreeCity_House4/events.inc
index 1bddf3416..1bddf3416 100644
--- a/data/maps/events/FortreeCity_House4.inc
+++ b/data/maps/FortreeCity_House4/events.inc
diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/maps/FortreeCity_House4/scripts.inc
index 27ead9ec2..27ead9ec2 100644
--- a/data/scripts/maps/FortreeCity_House4.inc
+++ b/data/maps/FortreeCity_House4/scripts.inc
diff --git a/data/maps/events/FortreeCity_House5.inc b/data/maps/FortreeCity_House5/events.inc
index d6c03578e..d6c03578e 100644
--- a/data/maps/events/FortreeCity_House5.inc
+++ b/data/maps/FortreeCity_House5/events.inc
diff --git a/data/scripts/maps/FortreeCity_House5.inc b/data/maps/FortreeCity_House5/scripts.inc
index d4f1f2b02..d4f1f2b02 100644
--- a/data/scripts/maps/FortreeCity_House5.inc
+++ b/data/maps/FortreeCity_House5/scripts.inc
diff --git a/data/maps/events/FortreeCity_Mart.inc b/data/maps/FortreeCity_Mart/events.inc
index 115b04ccd..115b04ccd 100644
--- a/data/maps/events/FortreeCity_Mart.inc
+++ b/data/maps/FortreeCity_Mart/events.inc
diff --git a/data/scripts/maps/FortreeCity_Mart.inc b/data/maps/FortreeCity_Mart/scripts.inc
index 050fc8f4c..050fc8f4c 100644
--- a/data/scripts/maps/FortreeCity_Mart.inc
+++ b/data/maps/FortreeCity_Mart/scripts.inc
diff --git a/data/maps/events/FortreeCity_PokemonCenter_1F.inc b/data/maps/FortreeCity_PokemonCenter_1F/events.inc
index 4b681b5cb..4b681b5cb 100644
--- a/data/maps/events/FortreeCity_PokemonCenter_1F.inc
+++ b/data/maps/FortreeCity_PokemonCenter_1F/events.inc
diff --git a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc
index e119a0f29..e119a0f29 100644
--- a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc
+++ b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc
diff --git a/data/maps/events/FortreeCity_PokemonCenter_2F.inc b/data/maps/FortreeCity_PokemonCenter_2F/events.inc
index 7a7f666b2..7a7f666b2 100644
--- a/data/maps/events/FortreeCity_PokemonCenter_2F.inc
+++ b/data/maps/FortreeCity_PokemonCenter_2F/events.inc
diff --git a/data/scripts/maps/FortreeCity_PokemonCenter_2F.inc b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc
index f631aa3c6..f631aa3c6 100644
--- a/data/scripts/maps/FortreeCity_PokemonCenter_2F.inc
+++ b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/events/GraniteCave_1F.inc b/data/maps/GraniteCave_1F/events.inc
index 83368e186..83368e186 100644
--- a/data/maps/events/GraniteCave_1F.inc
+++ b/data/maps/GraniteCave_1F/events.inc
diff --git a/data/scripts/maps/GraniteCave_1F.inc b/data/maps/GraniteCave_1F/scripts.inc
index f3d303c0f..f3d303c0f 100644
--- a/data/scripts/maps/GraniteCave_1F.inc
+++ b/data/maps/GraniteCave_1F/scripts.inc
diff --git a/data/maps/events/GraniteCave_B1F.inc b/data/maps/GraniteCave_B1F/events.inc
index 90b0f498e..90b0f498e 100644
--- a/data/maps/events/GraniteCave_B1F.inc
+++ b/data/maps/GraniteCave_B1F/events.inc
diff --git a/data/scripts/maps/GraniteCave_B1F.inc b/data/maps/GraniteCave_B1F/scripts.inc
index 360b10a08..360b10a08 100644
--- a/data/scripts/maps/GraniteCave_B1F.inc
+++ b/data/maps/GraniteCave_B1F/scripts.inc
diff --git a/data/maps/events/GraniteCave_B2F.inc b/data/maps/GraniteCave_B2F/events.inc
index d7ce41812..d7ce41812 100644
--- a/data/maps/events/GraniteCave_B2F.inc
+++ b/data/maps/GraniteCave_B2F/events.inc
diff --git a/data/scripts/maps/GraniteCave_B2F.inc b/data/maps/GraniteCave_B2F/scripts.inc
index d8cacbe38..d8cacbe38 100644
--- a/data/scripts/maps/GraniteCave_B2F.inc
+++ b/data/maps/GraniteCave_B2F/scripts.inc
diff --git a/data/maps/events/GraniteCave_StevensRoom.inc b/data/maps/GraniteCave_StevensRoom/events.inc
index 49e808cda..49e808cda 100644
--- a/data/maps/events/GraniteCave_StevensRoom.inc
+++ b/data/maps/GraniteCave_StevensRoom/events.inc
diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc
index b057a0548..b057a0548 100644
--- a/data/scripts/maps/GraniteCave_StevensRoom.inc
+++ b/data/maps/GraniteCave_StevensRoom/scripts.inc
diff --git a/data/maps/events/InsideOfTruck.inc b/data/maps/InsideOfTruck/events.inc
index 5dafdf1fd..5dafdf1fd 100644
--- a/data/maps/events/InsideOfTruck.inc
+++ b/data/maps/InsideOfTruck/events.inc
diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/maps/InsideOfTruck/scripts.inc
index 963dd196d..963dd196d 100644
--- a/data/scripts/maps/InsideOfTruck.inc
+++ b/data/maps/InsideOfTruck/scripts.inc
diff --git a/data/maps/events/IslandCave.inc b/data/maps/IslandCave/events.inc
index d7807a725..d7807a725 100644
--- a/data/maps/events/IslandCave.inc
+++ b/data/maps/IslandCave/events.inc
diff --git a/data/scripts/maps/IslandCave.inc b/data/maps/IslandCave/scripts.inc
index a96d13902..a96d13902 100644
--- a/data/scripts/maps/IslandCave.inc
+++ b/data/maps/IslandCave/scripts.inc
diff --git a/data/maps/events/JaggedPass.inc b/data/maps/JaggedPass/events.inc
index fe193cd97..fe193cd97 100644
--- a/data/maps/events/JaggedPass.inc
+++ b/data/maps/JaggedPass/events.inc
diff --git a/data/scripts/maps/JaggedPass.inc b/data/maps/JaggedPass/scripts.inc
index 15ac1bae6..15ac1bae6 100644
--- a/data/scripts/maps/JaggedPass.inc
+++ b/data/maps/JaggedPass/scripts.inc
diff --git a/data/maps/events/LavaridgeTown.inc b/data/maps/LavaridgeTown/events.inc
index cf32b8377..cf32b8377 100644
--- a/data/maps/events/LavaridgeTown.inc
+++ b/data/maps/LavaridgeTown/events.inc
diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/maps/LavaridgeTown/scripts.inc
index 5670d9b6e..5670d9b6e 100644
--- a/data/scripts/maps/LavaridgeTown.inc
+++ b/data/maps/LavaridgeTown/scripts.inc
diff --git a/data/maps/events/LavaridgeTown_Gym_1F.inc b/data/maps/LavaridgeTown_Gym_1F/events.inc
index cc35053f0..cc35053f0 100644
--- a/data/maps/events/LavaridgeTown_Gym_1F.inc
+++ b/data/maps/LavaridgeTown_Gym_1F/events.inc
diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc
index 1d317d43b..1d317d43b 100644
--- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc
+++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc
diff --git a/data/maps/events/LavaridgeTown_Gym_B1F.inc b/data/maps/LavaridgeTown_Gym_B1F/events.inc
index eabf8e51d..eabf8e51d 100644
--- a/data/maps/events/LavaridgeTown_Gym_B1F.inc
+++ b/data/maps/LavaridgeTown_Gym_B1F/events.inc
diff --git a/data/scripts/maps/LavaridgeTown_Gym_B1F.inc b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc
index ad2be83ea..ad2be83ea 100644
--- a/data/scripts/maps/LavaridgeTown_Gym_B1F.inc
+++ b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc
diff --git a/data/maps/events/LavaridgeTown_HerbShop.inc b/data/maps/LavaridgeTown_HerbShop/events.inc
index dd5ffdbe9..dd5ffdbe9 100644
--- a/data/maps/events/LavaridgeTown_HerbShop.inc
+++ b/data/maps/LavaridgeTown_HerbShop/events.inc
diff --git a/data/scripts/maps/LavaridgeTown_HerbShop.inc b/data/maps/LavaridgeTown_HerbShop/scripts.inc
index 6af8132e4..6af8132e4 100644
--- a/data/scripts/maps/LavaridgeTown_HerbShop.inc
+++ b/data/maps/LavaridgeTown_HerbShop/scripts.inc
diff --git a/data/maps/events/LavaridgeTown_House.inc b/data/maps/LavaridgeTown_House/events.inc
index 17809fc45..17809fc45 100644
--- a/data/maps/events/LavaridgeTown_House.inc
+++ b/data/maps/LavaridgeTown_House/events.inc
diff --git a/data/scripts/maps/LavaridgeTown_House.inc b/data/maps/LavaridgeTown_House/scripts.inc
index 14d112de9..14d112de9 100644
--- a/data/scripts/maps/LavaridgeTown_House.inc
+++ b/data/maps/LavaridgeTown_House/scripts.inc
diff --git a/data/maps/events/LavaridgeTown_Mart.inc b/data/maps/LavaridgeTown_Mart/events.inc
index 0206eefd7..0206eefd7 100644
--- a/data/maps/events/LavaridgeTown_Mart.inc
+++ b/data/maps/LavaridgeTown_Mart/events.inc
diff --git a/data/scripts/maps/LavaridgeTown_Mart.inc b/data/maps/LavaridgeTown_Mart/scripts.inc
index 2c5681983..2c5681983 100644
--- a/data/scripts/maps/LavaridgeTown_Mart.inc
+++ b/data/maps/LavaridgeTown_Mart/scripts.inc
diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc
index 767f01713..767f01713 100644
--- a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc
diff --git a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc
index 24f19b1d0..24f19b1d0 100644
--- a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc
diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc
index 3191e7533..3191e7533 100644
--- a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc
diff --git a/data/scripts/maps/LavaridgeTown_PokemonCenter_2F.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc
index b1491f621..b1491f621 100644
--- a/data/scripts/maps/LavaridgeTown_PokemonCenter_2F.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/events/LilycoveCity.inc b/data/maps/LilycoveCity/events.inc
index 343249c2d..343249c2d 100644
--- a/data/maps/events/LilycoveCity.inc
+++ b/data/maps/LilycoveCity/events.inc
diff --git a/data/scripts/maps/LilycoveCity.inc b/data/maps/LilycoveCity/scripts.inc
index 87a129620..87a129620 100644
--- a/data/scripts/maps/LilycoveCity.inc
+++ b/data/maps/LilycoveCity/scripts.inc
diff --git a/data/maps/events/LilycoveCity_ContestHall.inc b/data/maps/LilycoveCity_ContestHall/events.inc
index dd5655beb..dd5655beb 100644
--- a/data/maps/events/LilycoveCity_ContestHall.inc
+++ b/data/maps/LilycoveCity_ContestHall/events.inc
diff --git a/data/scripts/maps/LilycoveCity_ContestHall.inc b/data/maps/LilycoveCity_ContestHall/scripts.inc
index 3f02a404c..3f02a404c 100644
--- a/data/scripts/maps/LilycoveCity_ContestHall.inc
+++ b/data/maps/LilycoveCity_ContestHall/scripts.inc
diff --git a/data/maps/events/LilycoveCity_ContestLobby.inc b/data/maps/LilycoveCity_ContestLobby/events.inc
index d7c31c837..d7c31c837 100644
--- a/data/maps/events/LilycoveCity_ContestLobby.inc
+++ b/data/maps/LilycoveCity_ContestLobby/events.inc
diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc
index a4609ab54..a4609ab54 100644
--- a/data/scripts/maps/LilycoveCity_ContestLobby.inc
+++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc
diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc
index 7ccbc4aec..7ccbc4aec 100644
--- a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc
diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc
index 3468299a9..3468299a9 100644
--- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc
diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc
index 631eba91b..631eba91b 100644
--- a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc
diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc
index 90769b550..90769b550 100644
--- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc
diff --git a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc
index bdeda0bd9..bdeda0bd9 100644
--- a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
index 234751910..234751910 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
diff --git a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc
index aca7598ec..aca7598ec 100644
--- a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
index da97bbf81..da97bbf81 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc
index 17a6db615..17a6db615 100644
--- a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc
index 8de2d5d6f..8de2d5d6f 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc
index 1747ece5a..1747ece5a 100644
--- a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc
index 8bc6d8b29..8bc6d8b29 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc
index 93ef37b4b..93ef37b4b 100644
--- a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc
index 1d980f83e..1d980f83e 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc
index 5e6d0d94a..5e6d0d94a 100644
--- a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc
index b162c4740..b162c4740 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc
index f2b9b130a..f2b9b130a 100644
--- a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc
index d5f5e49ad..d5f5e49ad 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc
diff --git a/data/maps/events/LilycoveCity_Harbor.inc b/data/maps/LilycoveCity_Harbor/events.inc
index 73d21e9ce..73d21e9ce 100644
--- a/data/maps/events/LilycoveCity_Harbor.inc
+++ b/data/maps/LilycoveCity_Harbor/events.inc
diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/maps/LilycoveCity_Harbor/scripts.inc
index 1dfd9c29a..1dfd9c29a 100644
--- a/data/scripts/maps/LilycoveCity_Harbor.inc
+++ b/data/maps/LilycoveCity_Harbor/scripts.inc
diff --git a/data/maps/events/LilycoveCity_House1.inc b/data/maps/LilycoveCity_House1/events.inc
index d268037ba..d268037ba 100644
--- a/data/maps/events/LilycoveCity_House1.inc
+++ b/data/maps/LilycoveCity_House1/events.inc
diff --git a/data/scripts/maps/LilycoveCity_House1.inc b/data/maps/LilycoveCity_House1/scripts.inc
index 59418e667..59418e667 100644
--- a/data/scripts/maps/LilycoveCity_House1.inc
+++ b/data/maps/LilycoveCity_House1/scripts.inc
diff --git a/data/maps/events/LilycoveCity_House2.inc b/data/maps/LilycoveCity_House2/events.inc
index 7e5276102..7e5276102 100644
--- a/data/maps/events/LilycoveCity_House2.inc
+++ b/data/maps/LilycoveCity_House2/events.inc
diff --git a/data/scripts/maps/LilycoveCity_House2.inc b/data/maps/LilycoveCity_House2/scripts.inc
index 486df9be0..486df9be0 100644
--- a/data/scripts/maps/LilycoveCity_House2.inc
+++ b/data/maps/LilycoveCity_House2/scripts.inc
diff --git a/data/maps/events/LilycoveCity_House3.inc b/data/maps/LilycoveCity_House3/events.inc
index 4f582bdef..4f582bdef 100644
--- a/data/maps/events/LilycoveCity_House3.inc
+++ b/data/maps/LilycoveCity_House3/events.inc
diff --git a/data/scripts/maps/LilycoveCity_House3.inc b/data/maps/LilycoveCity_House3/scripts.inc
index 38210196e..38210196e 100644
--- a/data/scripts/maps/LilycoveCity_House3.inc
+++ b/data/maps/LilycoveCity_House3/scripts.inc
diff --git a/data/maps/events/LilycoveCity_House4.inc b/data/maps/LilycoveCity_House4/events.inc
index e85c296d3..e85c296d3 100644
--- a/data/maps/events/LilycoveCity_House4.inc
+++ b/data/maps/LilycoveCity_House4/events.inc
diff --git a/data/scripts/maps/LilycoveCity_House4.inc b/data/maps/LilycoveCity_House4/scripts.inc
index 8bfdb2d48..8bfdb2d48 100644
--- a/data/scripts/maps/LilycoveCity_House4.inc
+++ b/data/maps/LilycoveCity_House4/scripts.inc
diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc
index 47b39c6ee..47b39c6ee 100644
--- a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc
diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc
index c2f3be7d6..c2f3be7d6 100644
--- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc
diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc
index ba1e74e65..ba1e74e65 100644
--- a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc
diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
index 6b4f0f3da..6b4f0f3da 100644
--- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
diff --git a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc
index 784b388ae..784b388ae 100644
--- a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc
+++ b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc
diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc
index 19471d2e1..19471d2e1 100644
--- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc
+++ b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc
diff --git a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc
index dce57df3d..dce57df3d 100644
--- a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc
diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc
index b6ca09906..b6ca09906 100644
--- a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc
diff --git a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc
index ec8e4cf6e..ec8e4cf6e 100644
--- a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc
diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_2F.inc b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc
index f4a25f137..f4a25f137 100644
--- a/data/scripts/maps/LilycoveCity_PokemonCenter_2F.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc
index 228e56e4d..228e56e4d 100644
--- a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc
diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
index 74146fc7e..74146fc7e 100644
--- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
diff --git a/data/maps/events/LilycoveCity_UnusedMart.inc b/data/maps/LilycoveCity_UnusedMart/events.inc
index 0481a1c0b..0481a1c0b 100644
--- a/data/maps/events/LilycoveCity_UnusedMart.inc
+++ b/data/maps/LilycoveCity_UnusedMart/events.inc
diff --git a/data/scripts/maps/LilycoveCity_UnusedMart.inc b/data/maps/LilycoveCity_UnusedMart/scripts.inc
index fa0405f68..fa0405f68 100644
--- a/data/scripts/maps/LilycoveCity_UnusedMart.inc
+++ b/data/maps/LilycoveCity_UnusedMart/scripts.inc
diff --git a/data/maps/events/LinkContestRoom1.inc b/data/maps/LinkContestRoom1/events.inc
index c1bdfe3fb..c1bdfe3fb 100644
--- a/data/maps/events/LinkContestRoom1.inc
+++ b/data/maps/LinkContestRoom1/events.inc
diff --git a/data/scripts/maps/LinkContestRoom1.inc b/data/maps/LinkContestRoom1/scripts.inc
index 5276adcd8..5276adcd8 100644
--- a/data/scripts/maps/LinkContestRoom1.inc
+++ b/data/maps/LinkContestRoom1/scripts.inc
diff --git a/data/maps/events/LinkContestRoom2.inc b/data/maps/LinkContestRoom2/events.inc
index 89cb251d5..89cb251d5 100644
--- a/data/maps/events/LinkContestRoom2.inc
+++ b/data/maps/LinkContestRoom2/events.inc
diff --git a/data/scripts/maps/LinkContestRoom2.inc b/data/maps/LinkContestRoom2/scripts.inc
index ff85310f7..ff85310f7 100644
--- a/data/scripts/maps/LinkContestRoom2.inc
+++ b/data/maps/LinkContestRoom2/scripts.inc
diff --git a/data/maps/events/LinkContestRoom3.inc b/data/maps/LinkContestRoom3/events.inc
index 1e1b194c6..1e1b194c6 100644
--- a/data/maps/events/LinkContestRoom3.inc
+++ b/data/maps/LinkContestRoom3/events.inc
diff --git a/data/scripts/maps/LinkContestRoom3.inc b/data/maps/LinkContestRoom3/scripts.inc
index c3a5c95fb..c3a5c95fb 100644
--- a/data/scripts/maps/LinkContestRoom3.inc
+++ b/data/maps/LinkContestRoom3/scripts.inc
diff --git a/data/maps/events/LinkContestRoom4.inc b/data/maps/LinkContestRoom4/events.inc
index 56e608f20..56e608f20 100644
--- a/data/maps/events/LinkContestRoom4.inc
+++ b/data/maps/LinkContestRoom4/events.inc
diff --git a/data/scripts/maps/LinkContestRoom4.inc b/data/maps/LinkContestRoom4/scripts.inc
index 9a544e6f3..9a544e6f3 100644
--- a/data/scripts/maps/LinkContestRoom4.inc
+++ b/data/maps/LinkContestRoom4/scripts.inc
diff --git a/data/maps/events/LinkContestRoom5.inc b/data/maps/LinkContestRoom5/events.inc
index 90644518e..90644518e 100644
--- a/data/maps/events/LinkContestRoom5.inc
+++ b/data/maps/LinkContestRoom5/events.inc
diff --git a/data/scripts/maps/LinkContestRoom5.inc b/data/maps/LinkContestRoom5/scripts.inc
index f7ea72996..f7ea72996 100644
--- a/data/scripts/maps/LinkContestRoom5.inc
+++ b/data/maps/LinkContestRoom5/scripts.inc
diff --git a/data/maps/events/LinkContestRoom6.inc b/data/maps/LinkContestRoom6/events.inc
index 802987a1d..802987a1d 100644
--- a/data/maps/events/LinkContestRoom6.inc
+++ b/data/maps/LinkContestRoom6/events.inc
diff --git a/data/scripts/maps/LinkContestRoom6.inc b/data/maps/LinkContestRoom6/scripts.inc
index bea65ea48..bea65ea48 100644
--- a/data/scripts/maps/LinkContestRoom6.inc
+++ b/data/maps/LinkContestRoom6/scripts.inc
diff --git a/data/maps/events/LittlerootTown.inc b/data/maps/LittlerootTown/events.inc
index 23b8cc3e5..23b8cc3e5 100644
--- a/data/maps/events/LittlerootTown.inc
+++ b/data/maps/LittlerootTown/events.inc
diff --git a/data/scripts/maps/LittlerootTown.inc b/data/maps/LittlerootTown/scripts.inc
index eb78368af..eb78368af 100644
--- a/data/scripts/maps/LittlerootTown.inc
+++ b/data/maps/LittlerootTown/scripts.inc
diff --git a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc
index cd08fbad8..cd08fbad8 100644
--- a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc
diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
index 4c904b001..4c904b001 100644
--- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
diff --git a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc
index a6649c9b6..a6649c9b6 100644
--- a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc
diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
index 429c933fc..429c933fc 100644
--- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
diff --git a/data/maps/events/LittlerootTown_MaysHouse_1F.inc b/data/maps/LittlerootTown_MaysHouse_1F/events.inc
index 6822c20e8..6822c20e8 100644
--- a/data/maps/events/LittlerootTown_MaysHouse_1F.inc
+++ b/data/maps/LittlerootTown_MaysHouse_1F/events.inc
diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
index 99d47f938..99d47f938 100644
--- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
+++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
diff --git a/data/maps/events/LittlerootTown_MaysHouse_2F.inc b/data/maps/LittlerootTown_MaysHouse_2F/events.inc
index a5f1dd43c..a5f1dd43c 100644
--- a/data/maps/events/LittlerootTown_MaysHouse_2F.inc
+++ b/data/maps/LittlerootTown_MaysHouse_2F/events.inc
diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
index 5501f5ad5..5501f5ad5 100644
--- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
+++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
diff --git a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc
index a4596ce5c..a4596ce5c 100644
--- a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc
diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
index 75b83b6a1..75b83b6a1 100644
--- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
diff --git a/data/maps/events/MagmaHideout_1F.inc b/data/maps/MagmaHideout_1F/events.inc
index 1274e2373..1274e2373 100644
--- a/data/maps/events/MagmaHideout_1F.inc
+++ b/data/maps/MagmaHideout_1F/events.inc
diff --git a/data/scripts/maps/MagmaHideout_1F.inc b/data/maps/MagmaHideout_1F/scripts.inc
index 0e133a890..0e133a890 100644
--- a/data/scripts/maps/MagmaHideout_1F.inc
+++ b/data/maps/MagmaHideout_1F/scripts.inc
diff --git a/data/maps/events/MagmaHideout_2F_1R.inc b/data/maps/MagmaHideout_2F_1R/events.inc
index 32f835efc..32f835efc 100644
--- a/data/maps/events/MagmaHideout_2F_1R.inc
+++ b/data/maps/MagmaHideout_2F_1R/events.inc
diff --git a/data/scripts/maps/MagmaHideout_2F_1R.inc b/data/maps/MagmaHideout_2F_1R/scripts.inc
index 33252bb57..33252bb57 100644
--- a/data/scripts/maps/MagmaHideout_2F_1R.inc
+++ b/data/maps/MagmaHideout_2F_1R/scripts.inc
diff --git a/data/maps/events/MagmaHideout_2F_2R.inc b/data/maps/MagmaHideout_2F_2R/events.inc
index 5567bf9cf..5567bf9cf 100644
--- a/data/maps/events/MagmaHideout_2F_2R.inc
+++ b/data/maps/MagmaHideout_2F_2R/events.inc
diff --git a/data/scripts/maps/MagmaHideout_2F_2R.inc b/data/maps/MagmaHideout_2F_2R/scripts.inc
index 8b1e51f16..8b1e51f16 100644
--- a/data/scripts/maps/MagmaHideout_2F_2R.inc
+++ b/data/maps/MagmaHideout_2F_2R/scripts.inc
diff --git a/data/maps/events/MagmaHideout_2F_3R.inc b/data/maps/MagmaHideout_2F_3R/events.inc
index ca379a0c7..ca379a0c7 100644
--- a/data/maps/events/MagmaHideout_2F_3R.inc
+++ b/data/maps/MagmaHideout_2F_3R/events.inc
diff --git a/data/scripts/maps/MagmaHideout_2F_3R.inc b/data/maps/MagmaHideout_2F_3R/scripts.inc
index cbcb3fd52..cbcb3fd52 100644
--- a/data/scripts/maps/MagmaHideout_2F_3R.inc
+++ b/data/maps/MagmaHideout_2F_3R/scripts.inc
diff --git a/data/maps/events/MagmaHideout_3F_1R.inc b/data/maps/MagmaHideout_3F_1R/events.inc
index b2f157f57..b2f157f57 100644
--- a/data/maps/events/MagmaHideout_3F_1R.inc
+++ b/data/maps/MagmaHideout_3F_1R/events.inc
diff --git a/data/scripts/maps/MagmaHideout_3F_1R.inc b/data/maps/MagmaHideout_3F_1R/scripts.inc
index 068e71492..068e71492 100644
--- a/data/scripts/maps/MagmaHideout_3F_1R.inc
+++ b/data/maps/MagmaHideout_3F_1R/scripts.inc
diff --git a/data/maps/events/MagmaHideout_3F_2R.inc b/data/maps/MagmaHideout_3F_2R/events.inc
index 27ea129c3..27ea129c3 100644
--- a/data/maps/events/MagmaHideout_3F_2R.inc
+++ b/data/maps/MagmaHideout_3F_2R/events.inc
diff --git a/data/scripts/maps/MagmaHideout_3F_2R.inc b/data/maps/MagmaHideout_3F_2R/scripts.inc
index 15d0c26ea..15d0c26ea 100644
--- a/data/scripts/maps/MagmaHideout_3F_2R.inc
+++ b/data/maps/MagmaHideout_3F_2R/scripts.inc
diff --git a/data/maps/events/MagmaHideout_3F_3R.inc b/data/maps/MagmaHideout_3F_3R/events.inc
index 3f96b5652..3f96b5652 100644
--- a/data/maps/events/MagmaHideout_3F_3R.inc
+++ b/data/maps/MagmaHideout_3F_3R/events.inc
diff --git a/data/scripts/maps/MagmaHideout_3F_3R.inc b/data/maps/MagmaHideout_3F_3R/scripts.inc
index e85cff9a3..e85cff9a3 100644
--- a/data/scripts/maps/MagmaHideout_3F_3R.inc
+++ b/data/maps/MagmaHideout_3F_3R/scripts.inc
diff --git a/data/maps/events/MagmaHideout_4F.inc b/data/maps/MagmaHideout_4F/events.inc
index 1865c3b84..1865c3b84 100644
--- a/data/maps/events/MagmaHideout_4F.inc
+++ b/data/maps/MagmaHideout_4F/events.inc
diff --git a/data/scripts/maps/MagmaHideout_4F.inc b/data/maps/MagmaHideout_4F/scripts.inc
index 0cc0fea56..0cc0fea56 100644
--- a/data/scripts/maps/MagmaHideout_4F.inc
+++ b/data/maps/MagmaHideout_4F/scripts.inc
diff --git a/data/maps/events/MarineCave_End.inc b/data/maps/MarineCave_End/events.inc
index 14903539b..14903539b 100644
--- a/data/maps/events/MarineCave_End.inc
+++ b/data/maps/MarineCave_End/events.inc
diff --git a/data/scripts/maps/MarineCave_End.inc b/data/maps/MarineCave_End/scripts.inc
index 9c821e14f..9c821e14f 100644
--- a/data/scripts/maps/MarineCave_End.inc
+++ b/data/maps/MarineCave_End/scripts.inc
diff --git a/data/maps/events/MarineCave_Entrance.inc b/data/maps/MarineCave_Entrance/events.inc
index 4db3e1ddc..4db3e1ddc 100644
--- a/data/maps/events/MarineCave_Entrance.inc
+++ b/data/maps/MarineCave_Entrance/events.inc
diff --git a/data/scripts/maps/MarineCave_Entrance.inc b/data/maps/MarineCave_Entrance/scripts.inc
index 24b288050..24b288050 100644
--- a/data/scripts/maps/MarineCave_Entrance.inc
+++ b/data/maps/MarineCave_Entrance/scripts.inc
diff --git a/data/maps/events/MauvilleCity.inc b/data/maps/MauvilleCity/events.inc
index c8318005c..c8318005c 100644
--- a/data/maps/events/MauvilleCity.inc
+++ b/data/maps/MauvilleCity/events.inc
diff --git a/data/scripts/maps/MauvilleCity.inc b/data/maps/MauvilleCity/scripts.inc
index abb527d7f..abb527d7f 100644
--- a/data/scripts/maps/MauvilleCity.inc
+++ b/data/maps/MauvilleCity/scripts.inc
diff --git a/data/maps/events/MauvilleCity_BikeShop.inc b/data/maps/MauvilleCity_BikeShop/events.inc
index b4c0d19df..b4c0d19df 100644
--- a/data/maps/events/MauvilleCity_BikeShop.inc
+++ b/data/maps/MauvilleCity_BikeShop/events.inc
diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/maps/MauvilleCity_BikeShop/scripts.inc
index 0231e5bde..0231e5bde 100644
--- a/data/scripts/maps/MauvilleCity_BikeShop.inc
+++ b/data/maps/MauvilleCity_BikeShop/scripts.inc
diff --git a/data/maps/events/MauvilleCity_GameCorner.inc b/data/maps/MauvilleCity_GameCorner/events.inc
index a956f16d8..a956f16d8 100644
--- a/data/maps/events/MauvilleCity_GameCorner.inc
+++ b/data/maps/MauvilleCity_GameCorner/events.inc
diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc
index 400a24c24..400a24c24 100644
--- a/data/scripts/maps/MauvilleCity_GameCorner.inc
+++ b/data/maps/MauvilleCity_GameCorner/scripts.inc
diff --git a/data/maps/events/MauvilleCity_Gym.inc b/data/maps/MauvilleCity_Gym/events.inc
index 08c8db444..08c8db444 100644
--- a/data/maps/events/MauvilleCity_Gym.inc
+++ b/data/maps/MauvilleCity_Gym/events.inc
diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/maps/MauvilleCity_Gym/scripts.inc
index 049833db0..049833db0 100644
--- a/data/scripts/maps/MauvilleCity_Gym.inc
+++ b/data/maps/MauvilleCity_Gym/scripts.inc
diff --git a/data/maps/events/MauvilleCity_House1.inc b/data/maps/MauvilleCity_House1/events.inc
index 2590e33b9..2590e33b9 100644
--- a/data/maps/events/MauvilleCity_House1.inc
+++ b/data/maps/MauvilleCity_House1/events.inc
diff --git a/data/scripts/maps/MauvilleCity_House1.inc b/data/maps/MauvilleCity_House1/scripts.inc
index b36e116db..b36e116db 100644
--- a/data/scripts/maps/MauvilleCity_House1.inc
+++ b/data/maps/MauvilleCity_House1/scripts.inc
diff --git a/data/maps/events/MauvilleCity_House2.inc b/data/maps/MauvilleCity_House2/events.inc
index f8e04f5ea..f8e04f5ea 100644
--- a/data/maps/events/MauvilleCity_House2.inc
+++ b/data/maps/MauvilleCity_House2/events.inc
diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/maps/MauvilleCity_House2/scripts.inc
index 7a1a1cad1..7a1a1cad1 100644
--- a/data/scripts/maps/MauvilleCity_House2.inc
+++ b/data/maps/MauvilleCity_House2/scripts.inc
diff --git a/data/maps/events/MauvilleCity_Mart.inc b/data/maps/MauvilleCity_Mart/events.inc
index f67840783..f67840783 100644
--- a/data/maps/events/MauvilleCity_Mart.inc
+++ b/data/maps/MauvilleCity_Mart/events.inc
diff --git a/data/scripts/maps/MauvilleCity_Mart.inc b/data/maps/MauvilleCity_Mart/scripts.inc
index 56ee9497f..56ee9497f 100644
--- a/data/scripts/maps/MauvilleCity_Mart.inc
+++ b/data/maps/MauvilleCity_Mart/scripts.inc
diff --git a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc
index adab7d3e4..adab7d3e4 100644
--- a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc
diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
index fb76a5fc7..fb76a5fc7 100644
--- a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
diff --git a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc
index c3a0c4990..c3a0c4990 100644
--- a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc
diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_2F.inc b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc
index c430b4440..c430b4440 100644
--- a/data/scripts/maps/MauvilleCity_PokemonCenter_2F.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/events/MeteorFalls_1F_1R.inc b/data/maps/MeteorFalls_1F_1R/events.inc
index 977559950..977559950 100644
--- a/data/maps/events/MeteorFalls_1F_1R.inc
+++ b/data/maps/MeteorFalls_1F_1R/events.inc
diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc
index b786dc961..b786dc961 100644
--- a/data/scripts/maps/MeteorFalls_1F_1R.inc
+++ b/data/maps/MeteorFalls_1F_1R/scripts.inc
diff --git a/data/maps/events/MeteorFalls_1F_2R.inc b/data/maps/MeteorFalls_1F_2R/events.inc
index 0436851c5..0436851c5 100644
--- a/data/maps/events/MeteorFalls_1F_2R.inc
+++ b/data/maps/MeteorFalls_1F_2R/events.inc
diff --git a/data/scripts/maps/MeteorFalls_1F_2R.inc b/data/maps/MeteorFalls_1F_2R/scripts.inc
index 4f4ab7c6b..4f4ab7c6b 100644
--- a/data/scripts/maps/MeteorFalls_1F_2R.inc
+++ b/data/maps/MeteorFalls_1F_2R/scripts.inc
diff --git a/data/maps/events/MeteorFalls_B1F_1R.inc b/data/maps/MeteorFalls_B1F_1R/events.inc
index 039f316d9..039f316d9 100644
--- a/data/maps/events/MeteorFalls_B1F_1R.inc
+++ b/data/maps/MeteorFalls_B1F_1R/events.inc
diff --git a/data/scripts/maps/MeteorFalls_B1F_1R.inc b/data/maps/MeteorFalls_B1F_1R/scripts.inc
index 551e68180..551e68180 100644
--- a/data/scripts/maps/MeteorFalls_B1F_1R.inc
+++ b/data/maps/MeteorFalls_B1F_1R/scripts.inc
diff --git a/data/maps/events/MeteorFalls_B1F_2R.inc b/data/maps/MeteorFalls_B1F_2R/events.inc
index 8e2c9e1c4..8e2c9e1c4 100644
--- a/data/maps/events/MeteorFalls_B1F_2R.inc
+++ b/data/maps/MeteorFalls_B1F_2R/events.inc
diff --git a/data/scripts/maps/MeteorFalls_B1F_2R.inc b/data/maps/MeteorFalls_B1F_2R/scripts.inc
index 775b5787c..775b5787c 100644
--- a/data/scripts/maps/MeteorFalls_B1F_2R.inc
+++ b/data/maps/MeteorFalls_B1F_2R/scripts.inc
diff --git a/data/maps/events/MeteorFalls_StevensCave.inc b/data/maps/MeteorFalls_StevensCave/events.inc
index ff920f86d..ff920f86d 100644
--- a/data/maps/events/MeteorFalls_StevensCave.inc
+++ b/data/maps/MeteorFalls_StevensCave/events.inc
diff --git a/data/scripts/maps/MeteorFalls_StevensCave.inc b/data/maps/MeteorFalls_StevensCave/scripts.inc
index 5226ddb4a..5226ddb4a 100644
--- a/data/scripts/maps/MeteorFalls_StevensCave.inc
+++ b/data/maps/MeteorFalls_StevensCave/scripts.inc
diff --git a/data/maps/events/MirageTower_1F.inc b/data/maps/MirageTower_1F/events.inc
index f35ce6d2a..f35ce6d2a 100644
--- a/data/maps/events/MirageTower_1F.inc
+++ b/data/maps/MirageTower_1F/events.inc
diff --git a/data/scripts/maps/MirageTower_1F.inc b/data/maps/MirageTower_1F/scripts.inc
index d7d9619b5..d7d9619b5 100644
--- a/data/scripts/maps/MirageTower_1F.inc
+++ b/data/maps/MirageTower_1F/scripts.inc
diff --git a/data/maps/events/MirageTower_2F.inc b/data/maps/MirageTower_2F/events.inc
index fdbafbe06..fdbafbe06 100644
--- a/data/maps/events/MirageTower_2F.inc
+++ b/data/maps/MirageTower_2F/events.inc
diff --git a/data/scripts/maps/MirageTower_2F.inc b/data/maps/MirageTower_2F/scripts.inc
index 79f3cce2a..79f3cce2a 100644
--- a/data/scripts/maps/MirageTower_2F.inc
+++ b/data/maps/MirageTower_2F/scripts.inc
diff --git a/data/maps/events/MirageTower_3F.inc b/data/maps/MirageTower_3F/events.inc
index e12b4873d..e12b4873d 100644
--- a/data/maps/events/MirageTower_3F.inc
+++ b/data/maps/MirageTower_3F/events.inc
diff --git a/data/scripts/maps/MirageTower_3F.inc b/data/maps/MirageTower_3F/scripts.inc
index 1ec82de55..1ec82de55 100644
--- a/data/scripts/maps/MirageTower_3F.inc
+++ b/data/maps/MirageTower_3F/scripts.inc
diff --git a/data/maps/events/MirageTower_4F.inc b/data/maps/MirageTower_4F/events.inc
index 7b215a83a..7b215a83a 100644
--- a/data/maps/events/MirageTower_4F.inc
+++ b/data/maps/MirageTower_4F/events.inc
diff --git a/data/scripts/maps/MirageTower_4F.inc b/data/maps/MirageTower_4F/scripts.inc
index 1e079c5d7..1e079c5d7 100644
--- a/data/scripts/maps/MirageTower_4F.inc
+++ b/data/maps/MirageTower_4F/scripts.inc
diff --git a/data/maps/events/MossdeepCity.inc b/data/maps/MossdeepCity/events.inc
index d288400b5..d288400b5 100644
--- a/data/maps/events/MossdeepCity.inc
+++ b/data/maps/MossdeepCity/events.inc
diff --git a/data/scripts/maps/MossdeepCity.inc b/data/maps/MossdeepCity/scripts.inc
index 8cce8efeb..8cce8efeb 100644
--- a/data/scripts/maps/MossdeepCity.inc
+++ b/data/maps/MossdeepCity/scripts.inc
diff --git a/data/maps/events/MossdeepCity_GameCorner_1F.inc b/data/maps/MossdeepCity_GameCorner_1F/events.inc
index 42face3c4..42face3c4 100644
--- a/data/maps/events/MossdeepCity_GameCorner_1F.inc
+++ b/data/maps/MossdeepCity_GameCorner_1F/events.inc
diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc
index ff5c14206..ff5c14206 100644
--- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
+++ b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc
diff --git a/data/maps/events/MossdeepCity_GameCorner_B1F.inc b/data/maps/MossdeepCity_GameCorner_B1F/events.inc
index 7146d30b8..7146d30b8 100644
--- a/data/maps/events/MossdeepCity_GameCorner_B1F.inc
+++ b/data/maps/MossdeepCity_GameCorner_B1F/events.inc
diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc
index 695be3c6e..695be3c6e 100644
--- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
+++ b/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc
diff --git a/data/maps/events/MossdeepCity_Gym.inc b/data/maps/MossdeepCity_Gym/events.inc
index e383463af..e383463af 100644
--- a/data/maps/events/MossdeepCity_Gym.inc
+++ b/data/maps/MossdeepCity_Gym/events.inc
diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/maps/MossdeepCity_Gym/scripts.inc
index f38fd606d..f38fd606d 100644
--- a/data/scripts/maps/MossdeepCity_Gym.inc
+++ b/data/maps/MossdeepCity_Gym/scripts.inc
diff --git a/data/maps/events/MossdeepCity_House1.inc b/data/maps/MossdeepCity_House1/events.inc
index a7832fb09..a7832fb09 100644
--- a/data/maps/events/MossdeepCity_House1.inc
+++ b/data/maps/MossdeepCity_House1/events.inc
diff --git a/data/scripts/maps/MossdeepCity_House1.inc b/data/maps/MossdeepCity_House1/scripts.inc
index b08d296c7..b08d296c7 100644
--- a/data/scripts/maps/MossdeepCity_House1.inc
+++ b/data/maps/MossdeepCity_House1/scripts.inc
diff --git a/data/maps/events/MossdeepCity_House2.inc b/data/maps/MossdeepCity_House2/events.inc
index 86ba58946..86ba58946 100644
--- a/data/maps/events/MossdeepCity_House2.inc
+++ b/data/maps/MossdeepCity_House2/events.inc
diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/maps/MossdeepCity_House2/scripts.inc
index c61f74d99..c61f74d99 100644
--- a/data/scripts/maps/MossdeepCity_House2.inc
+++ b/data/maps/MossdeepCity_House2/scripts.inc
diff --git a/data/maps/events/MossdeepCity_House3.inc b/data/maps/MossdeepCity_House3/events.inc
index e40e79e10..e40e79e10 100644
--- a/data/maps/events/MossdeepCity_House3.inc
+++ b/data/maps/MossdeepCity_House3/events.inc
diff --git a/data/scripts/maps/MossdeepCity_House3.inc b/data/maps/MossdeepCity_House3/scripts.inc
index dfdbfa956..dfdbfa956 100644
--- a/data/scripts/maps/MossdeepCity_House3.inc
+++ b/data/maps/MossdeepCity_House3/scripts.inc
diff --git a/data/maps/events/MossdeepCity_House4.inc b/data/maps/MossdeepCity_House4/events.inc
index 96d8fe7d8..96d8fe7d8 100644
--- a/data/maps/events/MossdeepCity_House4.inc
+++ b/data/maps/MossdeepCity_House4/events.inc
diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/maps/MossdeepCity_House4/scripts.inc
index cb3cc0d16..cb3cc0d16 100644
--- a/data/scripts/maps/MossdeepCity_House4.inc
+++ b/data/maps/MossdeepCity_House4/scripts.inc
diff --git a/data/maps/events/MossdeepCity_Mart.inc b/data/maps/MossdeepCity_Mart/events.inc
index d8314e6e5..d8314e6e5 100644
--- a/data/maps/events/MossdeepCity_Mart.inc
+++ b/data/maps/MossdeepCity_Mart/events.inc
diff --git a/data/scripts/maps/MossdeepCity_Mart.inc b/data/maps/MossdeepCity_Mart/scripts.inc
index ed7ecd035..ed7ecd035 100644
--- a/data/scripts/maps/MossdeepCity_Mart.inc
+++ b/data/maps/MossdeepCity_Mart/scripts.inc
diff --git a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc
index 7e56185b2..7e56185b2 100644
--- a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc
diff --git a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc
index 7fd2e61a0..7fd2e61a0 100644
--- a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc
diff --git a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc
index c5d5af15a..c5d5af15a 100644
--- a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc
diff --git a/data/scripts/maps/MossdeepCity_PokemonCenter_2F.inc b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc
index 142bce560..142bce560 100644
--- a/data/scripts/maps/MossdeepCity_PokemonCenter_2F.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc
index fa5a8f3bb..fa5a8f3bb 100644
--- a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc
diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
index 2edf6d251..2edf6d251 100644
--- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
diff --git a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc
index bf143934e..bf143934e 100644
--- a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc
diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
index 0052f09aa..0052f09aa 100644
--- a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
diff --git a/data/maps/events/MossdeepCity_StevensHouse.inc b/data/maps/MossdeepCity_StevensHouse/events.inc
index 0ee8e7d15..0ee8e7d15 100644
--- a/data/maps/events/MossdeepCity_StevensHouse.inc
+++ b/data/maps/MossdeepCity_StevensHouse/events.inc
diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc
index 14d0cd5c7..14d0cd5c7 100644
--- a/data/scripts/maps/MossdeepCity_StevensHouse.inc
+++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc
diff --git a/data/maps/events/MtChimney.inc b/data/maps/MtChimney/events.inc
index bb7e1a913..bb7e1a913 100644
--- a/data/maps/events/MtChimney.inc
+++ b/data/maps/MtChimney/events.inc
diff --git a/data/scripts/maps/MtChimney.inc b/data/maps/MtChimney/scripts.inc
index 28135bb1e..28135bb1e 100644
--- a/data/scripts/maps/MtChimney.inc
+++ b/data/maps/MtChimney/scripts.inc
diff --git a/data/maps/events/MtChimney_CableCarStation.inc b/data/maps/MtChimney_CableCarStation/events.inc
index 19385b3d5..19385b3d5 100644
--- a/data/maps/events/MtChimney_CableCarStation.inc
+++ b/data/maps/MtChimney_CableCarStation/events.inc
diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/maps/MtChimney_CableCarStation/scripts.inc
index b6c2118db..b6c2118db 100644
--- a/data/scripts/maps/MtChimney_CableCarStation.inc
+++ b/data/maps/MtChimney_CableCarStation/scripts.inc
diff --git a/data/maps/events/MtPyre_1F.inc b/data/maps/MtPyre_1F/events.inc
index 80bf46c2e..80bf46c2e 100644
--- a/data/maps/events/MtPyre_1F.inc
+++ b/data/maps/MtPyre_1F/events.inc
diff --git a/data/scripts/maps/MtPyre_1F.inc b/data/maps/MtPyre_1F/scripts.inc
index 51c8a88fb..51c8a88fb 100644
--- a/data/scripts/maps/MtPyre_1F.inc
+++ b/data/maps/MtPyre_1F/scripts.inc
diff --git a/data/maps/events/MtPyre_2F.inc b/data/maps/MtPyre_2F/events.inc
index d5b24c06f..d5b24c06f 100644
--- a/data/maps/events/MtPyre_2F.inc
+++ b/data/maps/MtPyre_2F/events.inc
diff --git a/data/scripts/maps/MtPyre_2F.inc b/data/maps/MtPyre_2F/scripts.inc
index de8520954..de8520954 100644
--- a/data/scripts/maps/MtPyre_2F.inc
+++ b/data/maps/MtPyre_2F/scripts.inc
diff --git a/data/maps/events/MtPyre_3F.inc b/data/maps/MtPyre_3F/events.inc
index bf0d1af77..bf0d1af77 100644
--- a/data/maps/events/MtPyre_3F.inc
+++ b/data/maps/MtPyre_3F/events.inc
diff --git a/data/scripts/maps/MtPyre_3F.inc b/data/maps/MtPyre_3F/scripts.inc
index ec5373509..ec5373509 100644
--- a/data/scripts/maps/MtPyre_3F.inc
+++ b/data/maps/MtPyre_3F/scripts.inc
diff --git a/data/maps/events/MtPyre_4F.inc b/data/maps/MtPyre_4F/events.inc
index e39075d8b..e39075d8b 100644
--- a/data/maps/events/MtPyre_4F.inc
+++ b/data/maps/MtPyre_4F/events.inc
diff --git a/data/scripts/maps/MtPyre_4F.inc b/data/maps/MtPyre_4F/scripts.inc
index 0573e0f11..0573e0f11 100644
--- a/data/scripts/maps/MtPyre_4F.inc
+++ b/data/maps/MtPyre_4F/scripts.inc
diff --git a/data/maps/events/MtPyre_5F.inc b/data/maps/MtPyre_5F/events.inc
index 03a9b773f..03a9b773f 100644
--- a/data/maps/events/MtPyre_5F.inc
+++ b/data/maps/MtPyre_5F/events.inc
diff --git a/data/scripts/maps/MtPyre_5F.inc b/data/maps/MtPyre_5F/scripts.inc
index 4678ac7e0..4678ac7e0 100644
--- a/data/scripts/maps/MtPyre_5F.inc
+++ b/data/maps/MtPyre_5F/scripts.inc
diff --git a/data/maps/events/MtPyre_6F.inc b/data/maps/MtPyre_6F/events.inc
index 1f00209b2..1f00209b2 100644
--- a/data/maps/events/MtPyre_6F.inc
+++ b/data/maps/MtPyre_6F/events.inc
diff --git a/data/scripts/maps/MtPyre_6F.inc b/data/maps/MtPyre_6F/scripts.inc
index 8d5d912c2..8d5d912c2 100644
--- a/data/scripts/maps/MtPyre_6F.inc
+++ b/data/maps/MtPyre_6F/scripts.inc
diff --git a/data/maps/events/MtPyre_Exterior.inc b/data/maps/MtPyre_Exterior/events.inc
index badd884f9..badd884f9 100644
--- a/data/maps/events/MtPyre_Exterior.inc
+++ b/data/maps/MtPyre_Exterior/events.inc
diff --git a/data/scripts/maps/MtPyre_Exterior.inc b/data/maps/MtPyre_Exterior/scripts.inc
index 8f757ebb4..8f757ebb4 100644
--- a/data/scripts/maps/MtPyre_Exterior.inc
+++ b/data/maps/MtPyre_Exterior/scripts.inc
diff --git a/data/maps/events/MtPyre_Summit.inc b/data/maps/MtPyre_Summit/events.inc
index 2df3aaafd..2df3aaafd 100644
--- a/data/maps/events/MtPyre_Summit.inc
+++ b/data/maps/MtPyre_Summit/events.inc
diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/maps/MtPyre_Summit/scripts.inc
index fe39e9d48..fe39e9d48 100644
--- a/data/scripts/maps/MtPyre_Summit.inc
+++ b/data/maps/MtPyre_Summit/scripts.inc
diff --git a/data/maps/events/NavelRock_B1F.inc b/data/maps/NavelRock_B1F/events.inc
index e83d221dd..e83d221dd 100644
--- a/data/maps/events/NavelRock_B1F.inc
+++ b/data/maps/NavelRock_B1F/events.inc
diff --git a/data/scripts/maps/NavelRock_B1F.inc b/data/maps/NavelRock_B1F/scripts.inc
index a8906f24d..a8906f24d 100644
--- a/data/scripts/maps/NavelRock_B1F.inc
+++ b/data/maps/NavelRock_B1F/scripts.inc
diff --git a/data/maps/events/NavelRock_Bottom.inc b/data/maps/NavelRock_Bottom/events.inc
index fec170ae9..fec170ae9 100644
--- a/data/maps/events/NavelRock_Bottom.inc
+++ b/data/maps/NavelRock_Bottom/events.inc
diff --git a/data/scripts/maps/NavelRock_Bottom.inc b/data/maps/NavelRock_Bottom/scripts.inc
index cce93e624..cce93e624 100644
--- a/data/scripts/maps/NavelRock_Bottom.inc
+++ b/data/maps/NavelRock_Bottom/scripts.inc
diff --git a/data/maps/events/NavelRock_Down01.inc b/data/maps/NavelRock_Down01/events.inc
index 3a6045215..3a6045215 100644
--- a/data/maps/events/NavelRock_Down01.inc
+++ b/data/maps/NavelRock_Down01/events.inc
diff --git a/data/scripts/maps/NavelRock_Down01.inc b/data/maps/NavelRock_Down01/scripts.inc
index 9677167eb..9677167eb 100644
--- a/data/scripts/maps/NavelRock_Down01.inc
+++ b/data/maps/NavelRock_Down01/scripts.inc
diff --git a/data/maps/events/NavelRock_Down02.inc b/data/maps/NavelRock_Down02/events.inc
index 7441539c9..7441539c9 100644
--- a/data/maps/events/NavelRock_Down02.inc
+++ b/data/maps/NavelRock_Down02/events.inc
diff --git a/data/scripts/maps/NavelRock_Down02.inc b/data/maps/NavelRock_Down02/scripts.inc
index 946530a4a..946530a4a 100644
--- a/data/scripts/maps/NavelRock_Down02.inc
+++ b/data/maps/NavelRock_Down02/scripts.inc
diff --git a/data/maps/events/NavelRock_Down03.inc b/data/maps/NavelRock_Down03/events.inc
index 20dabdfaf..20dabdfaf 100644
--- a/data/maps/events/NavelRock_Down03.inc
+++ b/data/maps/NavelRock_Down03/events.inc
diff --git a/data/scripts/maps/NavelRock_Down03.inc b/data/maps/NavelRock_Down03/scripts.inc
index 2a2a702c1..2a2a702c1 100644
--- a/data/scripts/maps/NavelRock_Down03.inc
+++ b/data/maps/NavelRock_Down03/scripts.inc
diff --git a/data/maps/events/NavelRock_Down04.inc b/data/maps/NavelRock_Down04/events.inc
index e50f6fe23..e50f6fe23 100644
--- a/data/maps/events/NavelRock_Down04.inc
+++ b/data/maps/NavelRock_Down04/events.inc
diff --git a/data/scripts/maps/NavelRock_Down04.inc b/data/maps/NavelRock_Down04/scripts.inc
index acf5aa456..acf5aa456 100644
--- a/data/scripts/maps/NavelRock_Down04.inc
+++ b/data/maps/NavelRock_Down04/scripts.inc
diff --git a/data/maps/events/NavelRock_Down05.inc b/data/maps/NavelRock_Down05/events.inc
index 500d38e9b..500d38e9b 100644
--- a/data/maps/events/NavelRock_Down05.inc
+++ b/data/maps/NavelRock_Down05/events.inc
diff --git a/data/scripts/maps/NavelRock_Down05.inc b/data/maps/NavelRock_Down05/scripts.inc
index 22a0c2059..22a0c2059 100644
--- a/data/scripts/maps/NavelRock_Down05.inc
+++ b/data/maps/NavelRock_Down05/scripts.inc
diff --git a/data/maps/events/NavelRock_Down06.inc b/data/maps/NavelRock_Down06/events.inc
index 077367747..077367747 100644
--- a/data/maps/events/NavelRock_Down06.inc
+++ b/data/maps/NavelRock_Down06/events.inc
diff --git a/data/scripts/maps/NavelRock_Down06.inc b/data/maps/NavelRock_Down06/scripts.inc
index 9acfe1e6a..9acfe1e6a 100644
--- a/data/scripts/maps/NavelRock_Down06.inc
+++ b/data/maps/NavelRock_Down06/scripts.inc
diff --git a/data/maps/events/NavelRock_Down07.inc b/data/maps/NavelRock_Down07/events.inc
index 83f7ce9a6..83f7ce9a6 100644
--- a/data/maps/events/NavelRock_Down07.inc
+++ b/data/maps/NavelRock_Down07/events.inc
diff --git a/data/scripts/maps/NavelRock_Down07.inc b/data/maps/NavelRock_Down07/scripts.inc
index 6c08fcc85..6c08fcc85 100644
--- a/data/scripts/maps/NavelRock_Down07.inc
+++ b/data/maps/NavelRock_Down07/scripts.inc
diff --git a/data/maps/events/NavelRock_Down08.inc b/data/maps/NavelRock_Down08/events.inc
index 38bef10e8..38bef10e8 100644
--- a/data/maps/events/NavelRock_Down08.inc
+++ b/data/maps/NavelRock_Down08/events.inc
diff --git a/data/scripts/maps/NavelRock_Down08.inc b/data/maps/NavelRock_Down08/scripts.inc
index 5a40a72a5..5a40a72a5 100644
--- a/data/scripts/maps/NavelRock_Down08.inc
+++ b/data/maps/NavelRock_Down08/scripts.inc
diff --git a/data/maps/events/NavelRock_Down09.inc b/data/maps/NavelRock_Down09/events.inc
index e3843e759..e3843e759 100644
--- a/data/maps/events/NavelRock_Down09.inc
+++ b/data/maps/NavelRock_Down09/events.inc
diff --git a/data/scripts/maps/NavelRock_Down09.inc b/data/maps/NavelRock_Down09/scripts.inc
index 80bbbc0e5..80bbbc0e5 100644
--- a/data/scripts/maps/NavelRock_Down09.inc
+++ b/data/maps/NavelRock_Down09/scripts.inc
diff --git a/data/maps/events/NavelRock_Down10.inc b/data/maps/NavelRock_Down10/events.inc
index 805e399b4..805e399b4 100644
--- a/data/maps/events/NavelRock_Down10.inc
+++ b/data/maps/NavelRock_Down10/events.inc
diff --git a/data/scripts/maps/NavelRock_Down10.inc b/data/maps/NavelRock_Down10/scripts.inc
index 2b27edeb5..2b27edeb5 100644
--- a/data/scripts/maps/NavelRock_Down10.inc
+++ b/data/maps/NavelRock_Down10/scripts.inc
diff --git a/data/maps/events/NavelRock_Down11.inc b/data/maps/NavelRock_Down11/events.inc
index 505a6ed6d..505a6ed6d 100644
--- a/data/maps/events/NavelRock_Down11.inc
+++ b/data/maps/NavelRock_Down11/events.inc
diff --git a/data/scripts/maps/NavelRock_Down11.inc b/data/maps/NavelRock_Down11/scripts.inc
index 91c6fa36a..91c6fa36a 100644
--- a/data/scripts/maps/NavelRock_Down11.inc
+++ b/data/maps/NavelRock_Down11/scripts.inc
diff --git a/data/maps/events/NavelRock_Entrance.inc b/data/maps/NavelRock_Entrance/events.inc
index ee45485a7..ee45485a7 100644
--- a/data/maps/events/NavelRock_Entrance.inc
+++ b/data/maps/NavelRock_Entrance/events.inc
diff --git a/data/scripts/maps/NavelRock_Entrance.inc b/data/maps/NavelRock_Entrance/scripts.inc
index 9c25f5054..9c25f5054 100644
--- a/data/scripts/maps/NavelRock_Entrance.inc
+++ b/data/maps/NavelRock_Entrance/scripts.inc
diff --git a/data/maps/events/NavelRock_Exterior.inc b/data/maps/NavelRock_Exterior/events.inc
index 66bbf376f..66bbf376f 100644
--- a/data/maps/events/NavelRock_Exterior.inc
+++ b/data/maps/NavelRock_Exterior/events.inc
diff --git a/data/scripts/maps/NavelRock_Exterior.inc b/data/maps/NavelRock_Exterior/scripts.inc
index daa3fc964..daa3fc964 100644
--- a/data/scripts/maps/NavelRock_Exterior.inc
+++ b/data/maps/NavelRock_Exterior/scripts.inc
diff --git a/data/maps/events/NavelRock_Fork.inc b/data/maps/NavelRock_Fork/events.inc
index 869dc0f08..869dc0f08 100644
--- a/data/maps/events/NavelRock_Fork.inc
+++ b/data/maps/NavelRock_Fork/events.inc
diff --git a/data/scripts/maps/NavelRock_Fork.inc b/data/maps/NavelRock_Fork/scripts.inc
index 4269feeac..4269feeac 100644
--- a/data/scripts/maps/NavelRock_Fork.inc
+++ b/data/maps/NavelRock_Fork/scripts.inc
diff --git a/data/maps/events/NavelRock_Harbor.inc b/data/maps/NavelRock_Harbor/events.inc
index 2ffdc5fa1..2ffdc5fa1 100644
--- a/data/maps/events/NavelRock_Harbor.inc
+++ b/data/maps/NavelRock_Harbor/events.inc
diff --git a/data/scripts/maps/NavelRock_Harbor.inc b/data/maps/NavelRock_Harbor/scripts.inc
index 7f5a9e4c7..7f5a9e4c7 100644
--- a/data/scripts/maps/NavelRock_Harbor.inc
+++ b/data/maps/NavelRock_Harbor/scripts.inc
diff --git a/data/maps/events/NavelRock_Top.inc b/data/maps/NavelRock_Top/events.inc
index dc7c1e7df..dc7c1e7df 100644
--- a/data/maps/events/NavelRock_Top.inc
+++ b/data/maps/NavelRock_Top/events.inc
diff --git a/data/scripts/maps/NavelRock_Top.inc b/data/maps/NavelRock_Top/scripts.inc
index 67ddbc373..67ddbc373 100644
--- a/data/scripts/maps/NavelRock_Top.inc
+++ b/data/maps/NavelRock_Top/scripts.inc
diff --git a/data/maps/events/NavelRock_Up1.inc b/data/maps/NavelRock_Up1/events.inc
index fd0741a6a..fd0741a6a 100644
--- a/data/maps/events/NavelRock_Up1.inc
+++ b/data/maps/NavelRock_Up1/events.inc
diff --git a/data/scripts/maps/NavelRock_Up1.inc b/data/maps/NavelRock_Up1/scripts.inc
index c85af5f0c..c85af5f0c 100644
--- a/data/scripts/maps/NavelRock_Up1.inc
+++ b/data/maps/NavelRock_Up1/scripts.inc
diff --git a/data/maps/events/NavelRock_Up2.inc b/data/maps/NavelRock_Up2/events.inc
index bd142b997..bd142b997 100644
--- a/data/maps/events/NavelRock_Up2.inc
+++ b/data/maps/NavelRock_Up2/events.inc
diff --git a/data/scripts/maps/NavelRock_Up2.inc b/data/maps/NavelRock_Up2/scripts.inc
index 27ae52190..27ae52190 100644
--- a/data/scripts/maps/NavelRock_Up2.inc
+++ b/data/maps/NavelRock_Up2/scripts.inc
diff --git a/data/maps/events/NavelRock_Up3.inc b/data/maps/NavelRock_Up3/events.inc
index 9491e5dac..9491e5dac 100644
--- a/data/maps/events/NavelRock_Up3.inc
+++ b/data/maps/NavelRock_Up3/events.inc
diff --git a/data/scripts/maps/NavelRock_Up3.inc b/data/maps/NavelRock_Up3/scripts.inc
index a9c3e2a3c..a9c3e2a3c 100644
--- a/data/scripts/maps/NavelRock_Up3.inc
+++ b/data/maps/NavelRock_Up3/scripts.inc
diff --git a/data/maps/events/NavelRock_Up4.inc b/data/maps/NavelRock_Up4/events.inc
index 3d81f1523..3d81f1523 100644
--- a/data/maps/events/NavelRock_Up4.inc
+++ b/data/maps/NavelRock_Up4/events.inc
diff --git a/data/scripts/maps/NavelRock_Up4.inc b/data/maps/NavelRock_Up4/scripts.inc
index c6beead6d..c6beead6d 100644
--- a/data/scripts/maps/NavelRock_Up4.inc
+++ b/data/maps/NavelRock_Up4/scripts.inc
diff --git a/data/maps/events/NewMauville_Entrance.inc b/data/maps/NewMauville_Entrance/events.inc
index 29f46af20..29f46af20 100644
--- a/data/maps/events/NewMauville_Entrance.inc
+++ b/data/maps/NewMauville_Entrance/events.inc
diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/maps/NewMauville_Entrance/scripts.inc
index 727b77985..727b77985 100644
--- a/data/scripts/maps/NewMauville_Entrance.inc
+++ b/data/maps/NewMauville_Entrance/scripts.inc
diff --git a/data/maps/events/NewMauville_Inside.inc b/data/maps/NewMauville_Inside/events.inc
index 794f1965c..794f1965c 100644
--- a/data/maps/events/NewMauville_Inside.inc
+++ b/data/maps/NewMauville_Inside/events.inc
diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/maps/NewMauville_Inside/scripts.inc
index 81b21287d..81b21287d 100644
--- a/data/scripts/maps/NewMauville_Inside.inc
+++ b/data/maps/NewMauville_Inside/scripts.inc
diff --git a/data/maps/events/OldaleTown.inc b/data/maps/OldaleTown/events.inc
index b7bc6ab08..b7bc6ab08 100644
--- a/data/maps/events/OldaleTown.inc
+++ b/data/maps/OldaleTown/events.inc
diff --git a/data/scripts/maps/OldaleTown.inc b/data/maps/OldaleTown/scripts.inc
index 32bca3703..32bca3703 100644
--- a/data/scripts/maps/OldaleTown.inc
+++ b/data/maps/OldaleTown/scripts.inc
diff --git a/data/maps/events/OldaleTown_House1.inc b/data/maps/OldaleTown_House1/events.inc
index cf853c8ac..cf853c8ac 100644
--- a/data/maps/events/OldaleTown_House1.inc
+++ b/data/maps/OldaleTown_House1/events.inc
diff --git a/data/scripts/maps/OldaleTown_House1.inc b/data/maps/OldaleTown_House1/scripts.inc
index 6a36ff57e..6a36ff57e 100644
--- a/data/scripts/maps/OldaleTown_House1.inc
+++ b/data/maps/OldaleTown_House1/scripts.inc
diff --git a/data/maps/events/OldaleTown_House2.inc b/data/maps/OldaleTown_House2/events.inc
index 2feeb8949..2feeb8949 100644
--- a/data/maps/events/OldaleTown_House2.inc
+++ b/data/maps/OldaleTown_House2/events.inc
diff --git a/data/scripts/maps/OldaleTown_House2.inc b/data/maps/OldaleTown_House2/scripts.inc
index 55941705c..55941705c 100644
--- a/data/scripts/maps/OldaleTown_House2.inc
+++ b/data/maps/OldaleTown_House2/scripts.inc
diff --git a/data/maps/events/OldaleTown_Mart.inc b/data/maps/OldaleTown_Mart/events.inc
index f850fa482..f850fa482 100644
--- a/data/maps/events/OldaleTown_Mart.inc
+++ b/data/maps/OldaleTown_Mart/events.inc
diff --git a/data/scripts/maps/OldaleTown_Mart.inc b/data/maps/OldaleTown_Mart/scripts.inc
index de8893712..de8893712 100644
--- a/data/scripts/maps/OldaleTown_Mart.inc
+++ b/data/maps/OldaleTown_Mart/scripts.inc
diff --git a/data/maps/events/OldaleTown_PokemonCenter_1F.inc b/data/maps/OldaleTown_PokemonCenter_1F/events.inc
index bb102baab..bb102baab 100644
--- a/data/maps/events/OldaleTown_PokemonCenter_1F.inc
+++ b/data/maps/OldaleTown_PokemonCenter_1F/events.inc
diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc
index ece540e70..ece540e70 100644
--- a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc
+++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc
diff --git a/data/maps/events/OldaleTown_PokemonCenter_2F.inc b/data/maps/OldaleTown_PokemonCenter_2F/events.inc
index b25b155ea..b25b155ea 100644
--- a/data/maps/events/OldaleTown_PokemonCenter_2F.inc
+++ b/data/maps/OldaleTown_PokemonCenter_2F/events.inc
diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_2F.inc b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc
index 788157beb..788157beb 100644
--- a/data/scripts/maps/OldaleTown_PokemonCenter_2F.inc
+++ b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/events/PacifidlogTown.inc b/data/maps/PacifidlogTown/events.inc
index 41d54e9fc..41d54e9fc 100644
--- a/data/maps/events/PacifidlogTown.inc
+++ b/data/maps/PacifidlogTown/events.inc
diff --git a/data/scripts/maps/PacifidlogTown.inc b/data/maps/PacifidlogTown/scripts.inc
index 1f4f0e872..1f4f0e872 100644
--- a/data/scripts/maps/PacifidlogTown.inc
+++ b/data/maps/PacifidlogTown/scripts.inc
diff --git a/data/maps/events/PacifidlogTown_House1.inc b/data/maps/PacifidlogTown_House1/events.inc
index 77ca4c832..77ca4c832 100644
--- a/data/maps/events/PacifidlogTown_House1.inc
+++ b/data/maps/PacifidlogTown_House1/events.inc
diff --git a/data/scripts/maps/PacifidlogTown_House1.inc b/data/maps/PacifidlogTown_House1/scripts.inc
index b4fe4c979..b4fe4c979 100644
--- a/data/scripts/maps/PacifidlogTown_House1.inc
+++ b/data/maps/PacifidlogTown_House1/scripts.inc
diff --git a/data/maps/events/PacifidlogTown_House2.inc b/data/maps/PacifidlogTown_House2/events.inc
index 450533014..450533014 100644
--- a/data/maps/events/PacifidlogTown_House2.inc
+++ b/data/maps/PacifidlogTown_House2/events.inc
diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/maps/PacifidlogTown_House2/scripts.inc
index 0e87677e6..0e87677e6 100644
--- a/data/scripts/maps/PacifidlogTown_House2.inc
+++ b/data/maps/PacifidlogTown_House2/scripts.inc
diff --git a/data/maps/events/PacifidlogTown_House3.inc b/data/maps/PacifidlogTown_House3/events.inc
index 635ba86a7..635ba86a7 100644
--- a/data/maps/events/PacifidlogTown_House3.inc
+++ b/data/maps/PacifidlogTown_House3/events.inc
diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/maps/PacifidlogTown_House3/scripts.inc
index 98977b766..98977b766 100644
--- a/data/scripts/maps/PacifidlogTown_House3.inc
+++ b/data/maps/PacifidlogTown_House3/scripts.inc
diff --git a/data/maps/events/PacifidlogTown_House4.inc b/data/maps/PacifidlogTown_House4/events.inc
index e5f8dd4f1..e5f8dd4f1 100644
--- a/data/maps/events/PacifidlogTown_House4.inc
+++ b/data/maps/PacifidlogTown_House4/events.inc
diff --git a/data/scripts/maps/PacifidlogTown_House4.inc b/data/maps/PacifidlogTown_House4/scripts.inc
index a3e9cf0a4..a3e9cf0a4 100644
--- a/data/scripts/maps/PacifidlogTown_House4.inc
+++ b/data/maps/PacifidlogTown_House4/scripts.inc
diff --git a/data/maps/events/PacifidlogTown_House5.inc b/data/maps/PacifidlogTown_House5/events.inc
index febb80ad6..febb80ad6 100644
--- a/data/maps/events/PacifidlogTown_House5.inc
+++ b/data/maps/PacifidlogTown_House5/events.inc
diff --git a/data/scripts/maps/PacifidlogTown_House5.inc b/data/maps/PacifidlogTown_House5/scripts.inc
index ec97a639e..ec97a639e 100644
--- a/data/scripts/maps/PacifidlogTown_House5.inc
+++ b/data/maps/PacifidlogTown_House5/scripts.inc
diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc
index 66b8caa67..66b8caa67 100644
--- a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc
diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc
index fd34cd2aa..fd34cd2aa 100644
--- a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc
diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc
index 1aa279980..1aa279980 100644
--- a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc
diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_2F.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc
index 0199c2215..0199c2215 100644
--- a/data/scripts/maps/PacifidlogTown_PokemonCenter_2F.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/events/PetalburgCity.inc b/data/maps/PetalburgCity/events.inc
index 29fe0e02e..29fe0e02e 100644
--- a/data/maps/events/PetalburgCity.inc
+++ b/data/maps/PetalburgCity/events.inc
diff --git a/data/scripts/maps/PetalburgCity.inc b/data/maps/PetalburgCity/scripts.inc
index 67a9f83f3..67a9f83f3 100644
--- a/data/scripts/maps/PetalburgCity.inc
+++ b/data/maps/PetalburgCity/scripts.inc
diff --git a/data/maps/events/PetalburgCity_Gym.inc b/data/maps/PetalburgCity_Gym/events.inc
index 2df386d2c..2df386d2c 100644
--- a/data/maps/events/PetalburgCity_Gym.inc
+++ b/data/maps/PetalburgCity_Gym/events.inc
diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/maps/PetalburgCity_Gym/scripts.inc
index e95e434b5..e95e434b5 100644
--- a/data/scripts/maps/PetalburgCity_Gym.inc
+++ b/data/maps/PetalburgCity_Gym/scripts.inc
diff --git a/data/maps/events/PetalburgCity_House1.inc b/data/maps/PetalburgCity_House1/events.inc
index dcd3b071f..dcd3b071f 100644
--- a/data/maps/events/PetalburgCity_House1.inc
+++ b/data/maps/PetalburgCity_House1/events.inc
diff --git a/data/scripts/maps/PetalburgCity_House1.inc b/data/maps/PetalburgCity_House1/scripts.inc
index f727ec8a1..f727ec8a1 100644
--- a/data/scripts/maps/PetalburgCity_House1.inc
+++ b/data/maps/PetalburgCity_House1/scripts.inc
diff --git a/data/maps/events/PetalburgCity_House2.inc b/data/maps/PetalburgCity_House2/events.inc
index 7d1a863cb..7d1a863cb 100644
--- a/data/maps/events/PetalburgCity_House2.inc
+++ b/data/maps/PetalburgCity_House2/events.inc
diff --git a/data/scripts/maps/PetalburgCity_House2.inc b/data/maps/PetalburgCity_House2/scripts.inc
index 44987b3d6..44987b3d6 100644
--- a/data/scripts/maps/PetalburgCity_House2.inc
+++ b/data/maps/PetalburgCity_House2/scripts.inc
diff --git a/data/maps/events/PetalburgCity_Mart.inc b/data/maps/PetalburgCity_Mart/events.inc
index 3dc327c6a..3dc327c6a 100644
--- a/data/maps/events/PetalburgCity_Mart.inc
+++ b/data/maps/PetalburgCity_Mart/events.inc
diff --git a/data/scripts/maps/PetalburgCity_Mart.inc b/data/maps/PetalburgCity_Mart/scripts.inc
index 665ad3bae..665ad3bae 100644
--- a/data/scripts/maps/PetalburgCity_Mart.inc
+++ b/data/maps/PetalburgCity_Mart/scripts.inc
diff --git a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc
index e7a4ec6e6..e7a4ec6e6 100644
--- a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc
diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc
index f4a31854e..f4a31854e 100644
--- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc
diff --git a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc
index 7d2ff52f4..7d2ff52f4 100644
--- a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc
diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_2F.inc b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc
index 38d01972a..38d01972a 100644
--- a/data/scripts/maps/PetalburgCity_PokemonCenter_2F.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/events/PetalburgCity_WallysHouse.inc b/data/maps/PetalburgCity_WallysHouse/events.inc
index 563d61579..563d61579 100644
--- a/data/maps/events/PetalburgCity_WallysHouse.inc
+++ b/data/maps/PetalburgCity_WallysHouse/events.inc
diff --git a/data/scripts/maps/PetalburgCity_WallysHouse.inc b/data/maps/PetalburgCity_WallysHouse/scripts.inc
index e64bd57b1..e64bd57b1 100644
--- a/data/scripts/maps/PetalburgCity_WallysHouse.inc
+++ b/data/maps/PetalburgCity_WallysHouse/scripts.inc
diff --git a/data/maps/events/PetalburgWoods.inc b/data/maps/PetalburgWoods/events.inc
index da904f8ef..da904f8ef 100644
--- a/data/maps/events/PetalburgWoods.inc
+++ b/data/maps/PetalburgWoods/events.inc
diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/maps/PetalburgWoods/scripts.inc
index 7c9a1ae49..7c9a1ae49 100644
--- a/data/scripts/maps/PetalburgWoods.inc
+++ b/data/maps/PetalburgWoods/scripts.inc
diff --git a/data/maps/events/RecordCorner.inc b/data/maps/RecordCorner/events.inc
index 7970c14ba..7970c14ba 100644
--- a/data/maps/events/RecordCorner.inc
+++ b/data/maps/RecordCorner/events.inc
diff --git a/data/scripts/maps/RecordCorner.inc b/data/maps/RecordCorner/scripts.inc
index 4f342b860..4f342b860 100644
--- a/data/scripts/maps/RecordCorner.inc
+++ b/data/maps/RecordCorner/scripts.inc
diff --git a/data/maps/events/Route101.inc b/data/maps/Route101/events.inc
index 82b674f9e..82b674f9e 100644
--- a/data/maps/events/Route101.inc
+++ b/data/maps/Route101/events.inc
diff --git a/data/scripts/maps/Route101.inc b/data/maps/Route101/scripts.inc
index 9593ae59e..9593ae59e 100644
--- a/data/scripts/maps/Route101.inc
+++ b/data/maps/Route101/scripts.inc
diff --git a/data/maps/events/Route102.inc b/data/maps/Route102/events.inc
index fc30a195c..fc30a195c 100644
--- a/data/maps/events/Route102.inc
+++ b/data/maps/Route102/events.inc
diff --git a/data/scripts/maps/Route102.inc b/data/maps/Route102/scripts.inc
index cd817df35..cd817df35 100644
--- a/data/scripts/maps/Route102.inc
+++ b/data/maps/Route102/scripts.inc
diff --git a/data/maps/events/Route103.inc b/data/maps/Route103/events.inc
index e4bf74177..e4bf74177 100644
--- a/data/maps/events/Route103.inc
+++ b/data/maps/Route103/events.inc
diff --git a/data/scripts/maps/Route103.inc b/data/maps/Route103/scripts.inc
index 8bf597902..8bf597902 100644
--- a/data/scripts/maps/Route103.inc
+++ b/data/maps/Route103/scripts.inc
diff --git a/data/maps/events/Route104.inc b/data/maps/Route104/events.inc
index 315b5614e..315b5614e 100644
--- a/data/maps/events/Route104.inc
+++ b/data/maps/Route104/events.inc
diff --git a/data/scripts/maps/Route104.inc b/data/maps/Route104/scripts.inc
index 83cfe5d92..83cfe5d92 100644
--- a/data/scripts/maps/Route104.inc
+++ b/data/maps/Route104/scripts.inc
diff --git a/data/maps/events/Route104_MrBrineysHouse.inc b/data/maps/Route104_MrBrineysHouse/events.inc
index 9eccc2286..9eccc2286 100644
--- a/data/maps/events/Route104_MrBrineysHouse.inc
+++ b/data/maps/Route104_MrBrineysHouse/events.inc
diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc
index 1721fa4a0..1721fa4a0 100644
--- a/data/scripts/maps/Route104_MrBrineysHouse.inc
+++ b/data/maps/Route104_MrBrineysHouse/scripts.inc
diff --git a/data/maps/events/Route104_PrettyPetalFlowerShop.inc b/data/maps/Route104_PrettyPetalFlowerShop/events.inc
index 025daad04..025daad04 100644
--- a/data/maps/events/Route104_PrettyPetalFlowerShop.inc
+++ b/data/maps/Route104_PrettyPetalFlowerShop/events.inc
diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc
index 5142a1282..5142a1282 100644
--- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc
+++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc
diff --git a/data/maps/events/Route104_Prototype.inc b/data/maps/Route104_Prototype/events.inc
index 08976e5a8..08976e5a8 100644
--- a/data/maps/events/Route104_Prototype.inc
+++ b/data/maps/Route104_Prototype/events.inc
diff --git a/data/scripts/maps/Route104_Prototype.inc b/data/maps/Route104_Prototype/scripts.inc
index d8274fffc..d8274fffc 100644
--- a/data/scripts/maps/Route104_Prototype.inc
+++ b/data/maps/Route104_Prototype/scripts.inc
diff --git a/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc
index e66b3c841..e66b3c841 100644
--- a/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc
+++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc
diff --git a/data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc
index bacbad7e9..bacbad7e9 100644
--- a/data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.inc
+++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc
diff --git a/data/maps/events/Route105.inc b/data/maps/Route105/events.inc
index bbe9cf73b..bbe9cf73b 100644
--- a/data/maps/events/Route105.inc
+++ b/data/maps/Route105/events.inc
diff --git a/data/scripts/maps/Route105.inc b/data/maps/Route105/scripts.inc
index 3cb6d9ae6..3cb6d9ae6 100644
--- a/data/scripts/maps/Route105.inc
+++ b/data/maps/Route105/scripts.inc
diff --git a/data/maps/events/Route106.inc b/data/maps/Route106/events.inc
index 8fdbaad5f..8fdbaad5f 100644
--- a/data/maps/events/Route106.inc
+++ b/data/maps/Route106/events.inc
diff --git a/data/scripts/maps/Route106.inc b/data/maps/Route106/scripts.inc
index fdfff0587..fdfff0587 100644
--- a/data/scripts/maps/Route106.inc
+++ b/data/maps/Route106/scripts.inc
diff --git a/data/maps/events/Route107.inc b/data/maps/Route107/events.inc
index f748e2ff9..f748e2ff9 100644
--- a/data/maps/events/Route107.inc
+++ b/data/maps/Route107/events.inc
diff --git a/data/scripts/maps/Route107.inc b/data/maps/Route107/scripts.inc
index 2c8364592..2c8364592 100644
--- a/data/scripts/maps/Route107.inc
+++ b/data/maps/Route107/scripts.inc
diff --git a/data/maps/events/Route108.inc b/data/maps/Route108/events.inc
index 0a0b448c4..0a0b448c4 100644
--- a/data/maps/events/Route108.inc
+++ b/data/maps/Route108/events.inc
diff --git a/data/scripts/maps/Route108.inc b/data/maps/Route108/scripts.inc
index 25657c5a4..25657c5a4 100644
--- a/data/scripts/maps/Route108.inc
+++ b/data/maps/Route108/scripts.inc
diff --git a/data/maps/events/Route109.inc b/data/maps/Route109/events.inc
index 1d847897d..1d847897d 100644
--- a/data/maps/events/Route109.inc
+++ b/data/maps/Route109/events.inc
diff --git a/data/scripts/maps/Route109.inc b/data/maps/Route109/scripts.inc
index 84f7b7c34..84f7b7c34 100644
--- a/data/scripts/maps/Route109.inc
+++ b/data/maps/Route109/scripts.inc
diff --git a/data/maps/events/Route109_SeashoreHouse.inc b/data/maps/Route109_SeashoreHouse/events.inc
index 140b92a21..140b92a21 100644
--- a/data/maps/events/Route109_SeashoreHouse.inc
+++ b/data/maps/Route109_SeashoreHouse/events.inc
diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/maps/Route109_SeashoreHouse/scripts.inc
index e70f91ca8..e70f91ca8 100644
--- a/data/scripts/maps/Route109_SeashoreHouse.inc
+++ b/data/maps/Route109_SeashoreHouse/scripts.inc
diff --git a/data/maps/events/Route110.inc b/data/maps/Route110/events.inc
index c982ededf..c982ededf 100644
--- a/data/maps/events/Route110.inc
+++ b/data/maps/Route110/events.inc
diff --git a/data/scripts/maps/Route110.inc b/data/maps/Route110/scripts.inc
index 40d6a2e69..40d6a2e69 100644
--- a/data/scripts/maps/Route110.inc
+++ b/data/maps/Route110/scripts.inc
diff --git a/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc b/data/maps/Route110_SeasideCyclingRoadEntrance1/events.inc
index ed1750f79..ed1750f79 100644
--- a/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc
+++ b/data/maps/Route110_SeasideCyclingRoadEntrance1/events.inc
diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc b/data/maps/Route110_SeasideCyclingRoadEntrance1/scripts.inc
index 9579df56c..9579df56c 100644
--- a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc
+++ b/data/maps/Route110_SeasideCyclingRoadEntrance1/scripts.inc
diff --git a/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc b/data/maps/Route110_SeasideCyclingRoadEntrance2/events.inc
index 5ad30e6c1..5ad30e6c1 100644
--- a/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc
+++ b/data/maps/Route110_SeasideCyclingRoadEntrance2/events.inc
diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc b/data/maps/Route110_SeasideCyclingRoadEntrance2/scripts.inc
index 499969d6e..499969d6e 100644
--- a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc
+++ b/data/maps/Route110_SeasideCyclingRoadEntrance2/scripts.inc
diff --git a/data/maps/events/Route110_TrickHouseCorridor.inc b/data/maps/Route110_TrickHouseCorridor/events.inc
index e9d84d56b..e9d84d56b 100644
--- a/data/maps/events/Route110_TrickHouseCorridor.inc
+++ b/data/maps/Route110_TrickHouseCorridor/events.inc
diff --git a/data/scripts/maps/Route110_TrickHouseCorridor.inc b/data/maps/Route110_TrickHouseCorridor/scripts.inc
index cf520c81f..cf520c81f 100644
--- a/data/scripts/maps/Route110_TrickHouseCorridor.inc
+++ b/data/maps/Route110_TrickHouseCorridor/scripts.inc
diff --git a/data/maps/events/Route110_TrickHouseEnd.inc b/data/maps/Route110_TrickHouseEnd/events.inc
index 12659457a..12659457a 100644
--- a/data/maps/events/Route110_TrickHouseEnd.inc
+++ b/data/maps/Route110_TrickHouseEnd/events.inc
diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc
index 4e15ddbe7..4e15ddbe7 100644
--- a/data/scripts/maps/Route110_TrickHouseEnd.inc
+++ b/data/maps/Route110_TrickHouseEnd/scripts.inc
diff --git a/data/maps/events/Route110_TrickHouseEntrance.inc b/data/maps/Route110_TrickHouseEntrance/events.inc
index 30a6892df..30a6892df 100644
--- a/data/maps/events/Route110_TrickHouseEntrance.inc
+++ b/data/maps/Route110_TrickHouseEntrance/events.inc
diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc
index 859a28d6a..859a28d6a 100644
--- a/data/scripts/maps/Route110_TrickHouseEntrance.inc
+++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle1.inc b/data/maps/Route110_TrickHousePuzzle1/events.inc
index 05824aa38..05824aa38 100644
--- a/data/maps/events/Route110_TrickHousePuzzle1.inc
+++ b/data/maps/Route110_TrickHousePuzzle1/events.inc
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle1.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc
index 340a7e03c..340a7e03c 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle1.inc
+++ b/data/maps/Route110_TrickHousePuzzle1/scripts.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle2.inc b/data/maps/Route110_TrickHousePuzzle2/events.inc
index a7259e3b3..a7259e3b3 100644
--- a/data/maps/events/Route110_TrickHousePuzzle2.inc
+++ b/data/maps/Route110_TrickHousePuzzle2/events.inc
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc
index b724b986d..b724b986d 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc
+++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle3.inc b/data/maps/Route110_TrickHousePuzzle3/events.inc
index 2f95cf052..2f95cf052 100644
--- a/data/maps/events/Route110_TrickHousePuzzle3.inc
+++ b/data/maps/Route110_TrickHousePuzzle3/events.inc
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc
index 9956f9889..9956f9889 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc
+++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle4.inc b/data/maps/Route110_TrickHousePuzzle4/events.inc
index b0dd3abf6..b0dd3abf6 100644
--- a/data/maps/events/Route110_TrickHousePuzzle4.inc
+++ b/data/maps/Route110_TrickHousePuzzle4/events.inc
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle4.inc b/data/maps/Route110_TrickHousePuzzle4/scripts.inc
index 56b4b02fb..56b4b02fb 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle4.inc
+++ b/data/maps/Route110_TrickHousePuzzle4/scripts.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle5.inc b/data/maps/Route110_TrickHousePuzzle5/events.inc
index 8da7daf11..8da7daf11 100644
--- a/data/maps/events/Route110_TrickHousePuzzle5.inc
+++ b/data/maps/Route110_TrickHousePuzzle5/events.inc
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc
index 5afce1c88..5afce1c88 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc
+++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle6.inc b/data/maps/Route110_TrickHousePuzzle6/events.inc
index 7fc098f2c..7fc098f2c 100644
--- a/data/maps/events/Route110_TrickHousePuzzle6.inc
+++ b/data/maps/Route110_TrickHousePuzzle6/events.inc
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc
index 0f20aac1f..0f20aac1f 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle6.inc
+++ b/data/maps/Route110_TrickHousePuzzle6/scripts.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle7.inc b/data/maps/Route110_TrickHousePuzzle7/events.inc
index e72aa929a..e72aa929a 100644
--- a/data/maps/events/Route110_TrickHousePuzzle7.inc
+++ b/data/maps/Route110_TrickHousePuzzle7/events.inc
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc
index fdf734423..fdf734423 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc
+++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle8.inc b/data/maps/Route110_TrickHousePuzzle8/events.inc
index eacc9e940..eacc9e940 100644
--- a/data/maps/events/Route110_TrickHousePuzzle8.inc
+++ b/data/maps/Route110_TrickHousePuzzle8/events.inc
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle8.inc b/data/maps/Route110_TrickHousePuzzle8/scripts.inc
index 369bc59a7..369bc59a7 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle8.inc
+++ b/data/maps/Route110_TrickHousePuzzle8/scripts.inc
diff --git a/data/maps/events/Route111.inc b/data/maps/Route111/events.inc
index cea2db8d5..cea2db8d5 100644
--- a/data/maps/events/Route111.inc
+++ b/data/maps/Route111/events.inc
diff --git a/data/scripts/maps/Route111.inc b/data/maps/Route111/scripts.inc
index fcbf32c91..fcbf32c91 100644
--- a/data/scripts/maps/Route111.inc
+++ b/data/maps/Route111/scripts.inc
diff --git a/data/maps/events/Route111_OldLadysRestStop.inc b/data/maps/Route111_OldLadysRestStop/events.inc
index 5ade76ba3..5ade76ba3 100644
--- a/data/maps/events/Route111_OldLadysRestStop.inc
+++ b/data/maps/Route111_OldLadysRestStop/events.inc
diff --git a/data/scripts/maps/Route111_OldLadysRestStop.inc b/data/maps/Route111_OldLadysRestStop/scripts.inc
index 015a584f4..015a584f4 100644
--- a/data/scripts/maps/Route111_OldLadysRestStop.inc
+++ b/data/maps/Route111_OldLadysRestStop/scripts.inc
diff --git a/data/maps/events/Route111_WinstrateFamilysHouse.inc b/data/maps/Route111_WinstrateFamilysHouse/events.inc
index 0fe5b5df4..0fe5b5df4 100644
--- a/data/maps/events/Route111_WinstrateFamilysHouse.inc
+++ b/data/maps/Route111_WinstrateFamilysHouse/events.inc
diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc
index 847119d2e..847119d2e 100644
--- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc
+++ b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc
diff --git a/data/maps/events/Route112.inc b/data/maps/Route112/events.inc
index 0e218cd78..0e218cd78 100644
--- a/data/maps/events/Route112.inc
+++ b/data/maps/Route112/events.inc
diff --git a/data/scripts/maps/Route112.inc b/data/maps/Route112/scripts.inc
index 0ad5ee47c..0ad5ee47c 100644
--- a/data/scripts/maps/Route112.inc
+++ b/data/maps/Route112/scripts.inc
diff --git a/data/maps/events/Route112_CableCarStation.inc b/data/maps/Route112_CableCarStation/events.inc
index 77f37d72c..77f37d72c 100644
--- a/data/maps/events/Route112_CableCarStation.inc
+++ b/data/maps/Route112_CableCarStation/events.inc
diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/maps/Route112_CableCarStation/scripts.inc
index 93e8ea759..93e8ea759 100644
--- a/data/scripts/maps/Route112_CableCarStation.inc
+++ b/data/maps/Route112_CableCarStation/scripts.inc
diff --git a/data/maps/events/Route113.inc b/data/maps/Route113/events.inc
index 25287a747..25287a747 100644
--- a/data/maps/events/Route113.inc
+++ b/data/maps/Route113/events.inc
diff --git a/data/scripts/maps/Route113.inc b/data/maps/Route113/scripts.inc
index 63dc6c47f..63dc6c47f 100644
--- a/data/scripts/maps/Route113.inc
+++ b/data/maps/Route113/scripts.inc
diff --git a/data/maps/events/Route113_GlassWorkshop.inc b/data/maps/Route113_GlassWorkshop/events.inc
index 1d5104e1c..1d5104e1c 100644
--- a/data/maps/events/Route113_GlassWorkshop.inc
+++ b/data/maps/Route113_GlassWorkshop/events.inc
diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/maps/Route113_GlassWorkshop/scripts.inc
index 5ea100567..5ea100567 100644
--- a/data/scripts/maps/Route113_GlassWorkshop.inc
+++ b/data/maps/Route113_GlassWorkshop/scripts.inc
diff --git a/data/maps/events/Route114.inc b/data/maps/Route114/events.inc
index 3e48c5721..3e48c5721 100644
--- a/data/maps/events/Route114.inc
+++ b/data/maps/Route114/events.inc
diff --git a/data/scripts/maps/Route114.inc b/data/maps/Route114/scripts.inc
index 9443d35bc..9443d35bc 100644
--- a/data/scripts/maps/Route114.inc
+++ b/data/maps/Route114/scripts.inc
diff --git a/data/maps/events/Route114_FossilManiacsHouse.inc b/data/maps/Route114_FossilManiacsHouse/events.inc
index c947d9d8f..c947d9d8f 100644
--- a/data/maps/events/Route114_FossilManiacsHouse.inc
+++ b/data/maps/Route114_FossilManiacsHouse/events.inc
diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.inc b/data/maps/Route114_FossilManiacsHouse/scripts.inc
index f14c15f9e..f14c15f9e 100644
--- a/data/scripts/maps/Route114_FossilManiacsHouse.inc
+++ b/data/maps/Route114_FossilManiacsHouse/scripts.inc
diff --git a/data/maps/events/Route114_FossilManiacsTunnel.inc b/data/maps/Route114_FossilManiacsTunnel/events.inc
index 99edadee1..99edadee1 100644
--- a/data/maps/events/Route114_FossilManiacsTunnel.inc
+++ b/data/maps/Route114_FossilManiacsTunnel/events.inc
diff --git a/data/scripts/maps/Route114_FossilManiacsTunnel.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc
index bc5a6d977..bc5a6d977 100644
--- a/data/scripts/maps/Route114_FossilManiacsTunnel.inc
+++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc
diff --git a/data/maps/events/Route114_LanettesHouse.inc b/data/maps/Route114_LanettesHouse/events.inc
index 352bb2037..352bb2037 100644
--- a/data/maps/events/Route114_LanettesHouse.inc
+++ b/data/maps/Route114_LanettesHouse/events.inc
diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/maps/Route114_LanettesHouse/scripts.inc
index 00bb4f226..00bb4f226 100644
--- a/data/scripts/maps/Route114_LanettesHouse.inc
+++ b/data/maps/Route114_LanettesHouse/scripts.inc
diff --git a/data/maps/events/Route115.inc b/data/maps/Route115/events.inc
index 37d886e7f..37d886e7f 100644
--- a/data/maps/events/Route115.inc
+++ b/data/maps/Route115/events.inc
diff --git a/data/scripts/maps/Route115.inc b/data/maps/Route115/scripts.inc
index 2d4f7c2e3..2d4f7c2e3 100644
--- a/data/scripts/maps/Route115.inc
+++ b/data/maps/Route115/scripts.inc
diff --git a/data/maps/events/Route116.inc b/data/maps/Route116/events.inc
index 16afe4482..16afe4482 100644
--- a/data/maps/events/Route116.inc
+++ b/data/maps/Route116/events.inc
diff --git a/data/scripts/maps/Route116.inc b/data/maps/Route116/scripts.inc
index 68a32c3b5..68a32c3b5 100644
--- a/data/scripts/maps/Route116.inc
+++ b/data/maps/Route116/scripts.inc
diff --git a/data/maps/events/Route116_TunnelersRestHouse.inc b/data/maps/Route116_TunnelersRestHouse/events.inc
index 8d133ab6d..8d133ab6d 100644
--- a/data/maps/events/Route116_TunnelersRestHouse.inc
+++ b/data/maps/Route116_TunnelersRestHouse/events.inc
diff --git a/data/scripts/maps/Route116_TunnelersRestHouse.inc b/data/maps/Route116_TunnelersRestHouse/scripts.inc
index f9dbbd3f2..f9dbbd3f2 100644
--- a/data/scripts/maps/Route116_TunnelersRestHouse.inc
+++ b/data/maps/Route116_TunnelersRestHouse/scripts.inc
diff --git a/data/maps/events/Route117.inc b/data/maps/Route117/events.inc
index f84ef6212..f84ef6212 100644
--- a/data/maps/events/Route117.inc
+++ b/data/maps/Route117/events.inc
diff --git a/data/scripts/maps/Route117.inc b/data/maps/Route117/scripts.inc
index 55a7b910e..55a7b910e 100644
--- a/data/scripts/maps/Route117.inc
+++ b/data/maps/Route117/scripts.inc
diff --git a/data/maps/events/Route117_PokemonDayCare.inc b/data/maps/Route117_PokemonDayCare/events.inc
index 05220bdc9..05220bdc9 100644
--- a/data/maps/events/Route117_PokemonDayCare.inc
+++ b/data/maps/Route117_PokemonDayCare/events.inc
diff --git a/data/scripts/maps/Route117_PokemonDayCare.inc b/data/maps/Route117_PokemonDayCare/scripts.inc
index b2e9ddfaa..b2e9ddfaa 100644
--- a/data/scripts/maps/Route117_PokemonDayCare.inc
+++ b/data/maps/Route117_PokemonDayCare/scripts.inc
diff --git a/data/maps/events/Route118.inc b/data/maps/Route118/events.inc
index 5e732890d..5e732890d 100644
--- a/data/maps/events/Route118.inc
+++ b/data/maps/Route118/events.inc
diff --git a/data/scripts/maps/Route118.inc b/data/maps/Route118/scripts.inc
index 818111b81..818111b81 100644
--- a/data/scripts/maps/Route118.inc
+++ b/data/maps/Route118/scripts.inc
diff --git a/data/maps/events/Route119.inc b/data/maps/Route119/events.inc
index bd10dc05b..bd10dc05b 100644
--- a/data/maps/events/Route119.inc
+++ b/data/maps/Route119/events.inc
diff --git a/data/scripts/maps/Route119.inc b/data/maps/Route119/scripts.inc
index a4b6a5fb1..a4b6a5fb1 100644
--- a/data/scripts/maps/Route119.inc
+++ b/data/maps/Route119/scripts.inc
diff --git a/data/maps/events/Route119_House.inc b/data/maps/Route119_House/events.inc
index 05d426fe5..05d426fe5 100644
--- a/data/maps/events/Route119_House.inc
+++ b/data/maps/Route119_House/events.inc
diff --git a/data/scripts/maps/Route119_House.inc b/data/maps/Route119_House/scripts.inc
index 5e633437d..5e633437d 100644
--- a/data/scripts/maps/Route119_House.inc
+++ b/data/maps/Route119_House/scripts.inc
diff --git a/data/maps/events/Route119_WeatherInstitute_1F.inc b/data/maps/Route119_WeatherInstitute_1F/events.inc
index ee9f42ac5..ee9f42ac5 100644
--- a/data/maps/events/Route119_WeatherInstitute_1F.inc
+++ b/data/maps/Route119_WeatherInstitute_1F/events.inc
diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc
index b008f52c0..b008f52c0 100644
--- a/data/scripts/maps/Route119_WeatherInstitute_1F.inc
+++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc
diff --git a/data/maps/events/Route119_WeatherInstitute_2F.inc b/data/maps/Route119_WeatherInstitute_2F/events.inc
index 4196be41b..4196be41b 100644
--- a/data/maps/events/Route119_WeatherInstitute_2F.inc
+++ b/data/maps/Route119_WeatherInstitute_2F/events.inc
diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc
index b2341bf3d..b2341bf3d 100644
--- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc
+++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc
diff --git a/data/maps/events/Route120.inc b/data/maps/Route120/events.inc
index a19a70f33..a19a70f33 100644
--- a/data/maps/events/Route120.inc
+++ b/data/maps/Route120/events.inc
diff --git a/data/scripts/maps/Route120.inc b/data/maps/Route120/scripts.inc
index 7d6876aeb..7d6876aeb 100644
--- a/data/scripts/maps/Route120.inc
+++ b/data/maps/Route120/scripts.inc
diff --git a/data/maps/events/Route121.inc b/data/maps/Route121/events.inc
index 17ddae47f..17ddae47f 100644
--- a/data/maps/events/Route121.inc
+++ b/data/maps/Route121/events.inc
diff --git a/data/scripts/maps/Route121.inc b/data/maps/Route121/scripts.inc
index f133ffe56..f133ffe56 100644
--- a/data/scripts/maps/Route121.inc
+++ b/data/maps/Route121/scripts.inc
diff --git a/data/maps/events/Route121_SafariZoneEntrance.inc b/data/maps/Route121_SafariZoneEntrance/events.inc
index 2d8351534..2d8351534 100644
--- a/data/maps/events/Route121_SafariZoneEntrance.inc
+++ b/data/maps/Route121_SafariZoneEntrance/events.inc
diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc
index 1973b0e9e..1973b0e9e 100644
--- a/data/scripts/maps/Route121_SafariZoneEntrance.inc
+++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc
diff --git a/data/maps/events/Route122.inc b/data/maps/Route122/events.inc
index 4c5b9b464..4c5b9b464 100644
--- a/data/maps/events/Route122.inc
+++ b/data/maps/Route122/events.inc
diff --git a/data/scripts/maps/Route122.inc b/data/maps/Route122/scripts.inc
index 8fcfb4c09..8fcfb4c09 100644
--- a/data/scripts/maps/Route122.inc
+++ b/data/maps/Route122/scripts.inc
diff --git a/data/maps/events/Route123.inc b/data/maps/Route123/events.inc
index 0fc1b015b..0fc1b015b 100644
--- a/data/maps/events/Route123.inc
+++ b/data/maps/Route123/events.inc
diff --git a/data/scripts/maps/Route123.inc b/data/maps/Route123/scripts.inc
index b622a931b..b622a931b 100644
--- a/data/scripts/maps/Route123.inc
+++ b/data/maps/Route123/scripts.inc
diff --git a/data/maps/events/Route123_BerryMastersHouse.inc b/data/maps/Route123_BerryMastersHouse/events.inc
index 3f4725870..3f4725870 100644
--- a/data/maps/events/Route123_BerryMastersHouse.inc
+++ b/data/maps/Route123_BerryMastersHouse/events.inc
diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc
index 9e865ad6a..9e865ad6a 100644
--- a/data/scripts/maps/Route123_BerryMastersHouse.inc
+++ b/data/maps/Route123_BerryMastersHouse/scripts.inc
diff --git a/data/maps/events/Route124.inc b/data/maps/Route124/events.inc
index 2dc839783..2dc839783 100644
--- a/data/maps/events/Route124.inc
+++ b/data/maps/Route124/events.inc
diff --git a/data/scripts/maps/Route124.inc b/data/maps/Route124/scripts.inc
index b21e55417..b21e55417 100644
--- a/data/scripts/maps/Route124.inc
+++ b/data/maps/Route124/scripts.inc
diff --git a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc
index 606138e38..606138e38 100644
--- a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc
+++ b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc
diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc
index 0892b216a..0892b216a 100644
--- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc
+++ b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc
diff --git a/data/maps/events/Route125.inc b/data/maps/Route125/events.inc
index b767e512d..b767e512d 100644
--- a/data/maps/events/Route125.inc
+++ b/data/maps/Route125/events.inc
diff --git a/data/scripts/maps/Route125.inc b/data/maps/Route125/scripts.inc
index 2dda3fb2d..2dda3fb2d 100644
--- a/data/scripts/maps/Route125.inc
+++ b/data/maps/Route125/scripts.inc
diff --git a/data/maps/events/Route126.inc b/data/maps/Route126/events.inc
index cf87bb74e..cf87bb74e 100644
--- a/data/maps/events/Route126.inc
+++ b/data/maps/Route126/events.inc
diff --git a/data/scripts/maps/Route126.inc b/data/maps/Route126/scripts.inc
index 3ea9ba786..3ea9ba786 100644
--- a/data/scripts/maps/Route126.inc
+++ b/data/maps/Route126/scripts.inc
diff --git a/data/maps/events/Route127.inc b/data/maps/Route127/events.inc
index b7c378a96..b7c378a96 100644
--- a/data/maps/events/Route127.inc
+++ b/data/maps/Route127/events.inc
diff --git a/data/scripts/maps/Route127.inc b/data/maps/Route127/scripts.inc
index 12e5bf127..12e5bf127 100644
--- a/data/scripts/maps/Route127.inc
+++ b/data/maps/Route127/scripts.inc
diff --git a/data/maps/events/Route128.inc b/data/maps/Route128/events.inc
index c34f6eb16..c34f6eb16 100644
--- a/data/maps/events/Route128.inc
+++ b/data/maps/Route128/events.inc
diff --git a/data/scripts/maps/Route128.inc b/data/maps/Route128/scripts.inc
index 8e2742ff5..8e2742ff5 100644
--- a/data/scripts/maps/Route128.inc
+++ b/data/maps/Route128/scripts.inc
diff --git a/data/maps/events/Route129.inc b/data/maps/Route129/events.inc
index 7c1425ebe..7c1425ebe 100644
--- a/data/maps/events/Route129.inc
+++ b/data/maps/Route129/events.inc
diff --git a/data/scripts/maps/Route129.inc b/data/maps/Route129/scripts.inc
index 170d87e56..170d87e56 100644
--- a/data/scripts/maps/Route129.inc
+++ b/data/maps/Route129/scripts.inc
diff --git a/data/maps/events/Route130.inc b/data/maps/Route130/events.inc
index ad1429553..ad1429553 100644
--- a/data/maps/events/Route130.inc
+++ b/data/maps/Route130/events.inc
diff --git a/data/scripts/maps/Route130.inc b/data/maps/Route130/scripts.inc
index 26278cf50..26278cf50 100644
--- a/data/scripts/maps/Route130.inc
+++ b/data/maps/Route130/scripts.inc
diff --git a/data/maps/events/Route131.inc b/data/maps/Route131/events.inc
index 2bb2c5cbc..2bb2c5cbc 100644
--- a/data/maps/events/Route131.inc
+++ b/data/maps/Route131/events.inc
diff --git a/data/scripts/maps/Route131.inc b/data/maps/Route131/scripts.inc
index 566cbef66..566cbef66 100644
--- a/data/scripts/maps/Route131.inc
+++ b/data/maps/Route131/scripts.inc
diff --git a/data/maps/events/Route132.inc b/data/maps/Route132/events.inc
index 19ff5ccc8..19ff5ccc8 100644
--- a/data/maps/events/Route132.inc
+++ b/data/maps/Route132/events.inc
diff --git a/data/scripts/maps/Route132.inc b/data/maps/Route132/scripts.inc
index a4ae6f716..a4ae6f716 100644
--- a/data/scripts/maps/Route132.inc
+++ b/data/maps/Route132/scripts.inc
diff --git a/data/maps/events/Route133.inc b/data/maps/Route133/events.inc
index 6adfce330..6adfce330 100644
--- a/data/maps/events/Route133.inc
+++ b/data/maps/Route133/events.inc
diff --git a/data/scripts/maps/Route133.inc b/data/maps/Route133/scripts.inc
index dc15a5d40..dc15a5d40 100644
--- a/data/scripts/maps/Route133.inc
+++ b/data/maps/Route133/scripts.inc
diff --git a/data/maps/events/Route134.inc b/data/maps/Route134/events.inc
index 5a2d57417..5a2d57417 100644
--- a/data/maps/events/Route134.inc
+++ b/data/maps/Route134/events.inc
diff --git a/data/scripts/maps/Route134.inc b/data/maps/Route134/scripts.inc
index bdec88c42..bdec88c42 100644
--- a/data/scripts/maps/Route134.inc
+++ b/data/maps/Route134/scripts.inc
diff --git a/data/maps/events/RustboroCity.inc b/data/maps/RustboroCity/events.inc
index b71bdb875..b71bdb875 100644
--- a/data/maps/events/RustboroCity.inc
+++ b/data/maps/RustboroCity/events.inc
diff --git a/data/scripts/maps/RustboroCity.inc b/data/maps/RustboroCity/scripts.inc
index 6eb8d48bc..6eb8d48bc 100644
--- a/data/scripts/maps/RustboroCity.inc
+++ b/data/maps/RustboroCity/scripts.inc
diff --git a/data/maps/events/RustboroCity_CuttersHouse.inc b/data/maps/RustboroCity_CuttersHouse/events.inc
index db9b6f56d..db9b6f56d 100644
--- a/data/maps/events/RustboroCity_CuttersHouse.inc
+++ b/data/maps/RustboroCity_CuttersHouse/events.inc
diff --git a/data/scripts/maps/RustboroCity_CuttersHouse.inc b/data/maps/RustboroCity_CuttersHouse/scripts.inc
index e5c7527f7..e5c7527f7 100644
--- a/data/scripts/maps/RustboroCity_CuttersHouse.inc
+++ b/data/maps/RustboroCity_CuttersHouse/scripts.inc
diff --git a/data/maps/events/RustboroCity_DevonCorp_1F.inc b/data/maps/RustboroCity_DevonCorp_1F/events.inc
index c6d4048c4..c6d4048c4 100644
--- a/data/maps/events/RustboroCity_DevonCorp_1F.inc
+++ b/data/maps/RustboroCity_DevonCorp_1F/events.inc
diff --git a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc
index 97d7dcf78..97d7dcf78 100644
--- a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc
+++ b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc
diff --git a/data/maps/events/RustboroCity_DevonCorp_2F.inc b/data/maps/RustboroCity_DevonCorp_2F/events.inc
index 31a3d1de6..31a3d1de6 100644
--- a/data/maps/events/RustboroCity_DevonCorp_2F.inc
+++ b/data/maps/RustboroCity_DevonCorp_2F/events.inc
diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc
index 88f0c2e73..88f0c2e73 100644
--- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc
+++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc
diff --git a/data/maps/events/RustboroCity_DevonCorp_3F.inc b/data/maps/RustboroCity_DevonCorp_3F/events.inc
index 8db3c085c..8db3c085c 100644
--- a/data/maps/events/RustboroCity_DevonCorp_3F.inc
+++ b/data/maps/RustboroCity_DevonCorp_3F/events.inc
diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
index ffc2614cb..ffc2614cb 100644
--- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
+++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
diff --git a/data/maps/events/RustboroCity_Flat1_1F.inc b/data/maps/RustboroCity_Flat1_1F/events.inc
index 1f2ae85fd..1f2ae85fd 100644
--- a/data/maps/events/RustboroCity_Flat1_1F.inc
+++ b/data/maps/RustboroCity_Flat1_1F/events.inc
diff --git a/data/scripts/maps/RustboroCity_Flat1_1F.inc b/data/maps/RustboroCity_Flat1_1F/scripts.inc
index 947ea14d3..947ea14d3 100644
--- a/data/scripts/maps/RustboroCity_Flat1_1F.inc
+++ b/data/maps/RustboroCity_Flat1_1F/scripts.inc
diff --git a/data/maps/events/RustboroCity_Flat1_2F.inc b/data/maps/RustboroCity_Flat1_2F/events.inc
index 647e7a437..647e7a437 100644
--- a/data/maps/events/RustboroCity_Flat1_2F.inc
+++ b/data/maps/RustboroCity_Flat1_2F/events.inc
diff --git a/data/scripts/maps/RustboroCity_Flat1_2F.inc b/data/maps/RustboroCity_Flat1_2F/scripts.inc
index 425d61f52..425d61f52 100644
--- a/data/scripts/maps/RustboroCity_Flat1_2F.inc
+++ b/data/maps/RustboroCity_Flat1_2F/scripts.inc
diff --git a/data/maps/events/RustboroCity_Flat2_1F.inc b/data/maps/RustboroCity_Flat2_1F/events.inc
index 392f5b1fa..392f5b1fa 100644
--- a/data/maps/events/RustboroCity_Flat2_1F.inc
+++ b/data/maps/RustboroCity_Flat2_1F/events.inc
diff --git a/data/scripts/maps/RustboroCity_Flat2_1F.inc b/data/maps/RustboroCity_Flat2_1F/scripts.inc
index fbb174a29..fbb174a29 100644
--- a/data/scripts/maps/RustboroCity_Flat2_1F.inc
+++ b/data/maps/RustboroCity_Flat2_1F/scripts.inc
diff --git a/data/maps/events/RustboroCity_Flat2_2F.inc b/data/maps/RustboroCity_Flat2_2F/events.inc
index 9914eed3c..9914eed3c 100644
--- a/data/maps/events/RustboroCity_Flat2_2F.inc
+++ b/data/maps/RustboroCity_Flat2_2F/events.inc
diff --git a/data/scripts/maps/RustboroCity_Flat2_2F.inc b/data/maps/RustboroCity_Flat2_2F/scripts.inc
index e623aa485..e623aa485 100644
--- a/data/scripts/maps/RustboroCity_Flat2_2F.inc
+++ b/data/maps/RustboroCity_Flat2_2F/scripts.inc
diff --git a/data/maps/events/RustboroCity_Flat2_3F.inc b/data/maps/RustboroCity_Flat2_3F/events.inc
index 4a67fdc47..4a67fdc47 100644
--- a/data/maps/events/RustboroCity_Flat2_3F.inc
+++ b/data/maps/RustboroCity_Flat2_3F/events.inc
diff --git a/data/scripts/maps/RustboroCity_Flat2_3F.inc b/data/maps/RustboroCity_Flat2_3F/scripts.inc
index 6a267c336..6a267c336 100644
--- a/data/scripts/maps/RustboroCity_Flat2_3F.inc
+++ b/data/maps/RustboroCity_Flat2_3F/scripts.inc
diff --git a/data/maps/events/RustboroCity_Gym.inc b/data/maps/RustboroCity_Gym/events.inc
index 193c41685..193c41685 100644
--- a/data/maps/events/RustboroCity_Gym.inc
+++ b/data/maps/RustboroCity_Gym/events.inc
diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/maps/RustboroCity_Gym/scripts.inc
index 1d722b7de..1d722b7de 100644
--- a/data/scripts/maps/RustboroCity_Gym.inc
+++ b/data/maps/RustboroCity_Gym/scripts.inc
diff --git a/data/maps/events/RustboroCity_House1.inc b/data/maps/RustboroCity_House1/events.inc
index 1d2b2d0b7..1d2b2d0b7 100644
--- a/data/maps/events/RustboroCity_House1.inc
+++ b/data/maps/RustboroCity_House1/events.inc
diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/maps/RustboroCity_House1/scripts.inc
index d63536c55..d63536c55 100644
--- a/data/scripts/maps/RustboroCity_House1.inc
+++ b/data/maps/RustboroCity_House1/scripts.inc
diff --git a/data/maps/events/RustboroCity_House2.inc b/data/maps/RustboroCity_House2/events.inc
index 3a4e5e15e..3a4e5e15e 100644
--- a/data/maps/events/RustboroCity_House2.inc
+++ b/data/maps/RustboroCity_House2/events.inc
diff --git a/data/scripts/maps/RustboroCity_House2.inc b/data/maps/RustboroCity_House2/scripts.inc
index fd71dc016..fd71dc016 100644
--- a/data/scripts/maps/RustboroCity_House2.inc
+++ b/data/maps/RustboroCity_House2/scripts.inc
diff --git a/data/maps/events/RustboroCity_House3.inc b/data/maps/RustboroCity_House3/events.inc
index 07234fc2e..07234fc2e 100644
--- a/data/maps/events/RustboroCity_House3.inc
+++ b/data/maps/RustboroCity_House3/events.inc
diff --git a/data/scripts/maps/RustboroCity_House3.inc b/data/maps/RustboroCity_House3/scripts.inc
index 87d278099..87d278099 100644
--- a/data/scripts/maps/RustboroCity_House3.inc
+++ b/data/maps/RustboroCity_House3/scripts.inc
diff --git a/data/maps/events/RustboroCity_Mart.inc b/data/maps/RustboroCity_Mart/events.inc
index 038d13bf7..038d13bf7 100644
--- a/data/maps/events/RustboroCity_Mart.inc
+++ b/data/maps/RustboroCity_Mart/events.inc
diff --git a/data/scripts/maps/RustboroCity_Mart.inc b/data/maps/RustboroCity_Mart/scripts.inc
index daa445a0e..daa445a0e 100644
--- a/data/scripts/maps/RustboroCity_Mart.inc
+++ b/data/maps/RustboroCity_Mart/scripts.inc
diff --git a/data/maps/events/RustboroCity_PokemonCenter_1F.inc b/data/maps/RustboroCity_PokemonCenter_1F/events.inc
index e2945f435..e2945f435 100644
--- a/data/maps/events/RustboroCity_PokemonCenter_1F.inc
+++ b/data/maps/RustboroCity_PokemonCenter_1F/events.inc
diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc
index a9156d5aa..a9156d5aa 100644
--- a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc
+++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc
diff --git a/data/maps/events/RustboroCity_PokemonCenter_2F.inc b/data/maps/RustboroCity_PokemonCenter_2F/events.inc
index d1ec1adb9..d1ec1adb9 100644
--- a/data/maps/events/RustboroCity_PokemonCenter_2F.inc
+++ b/data/maps/RustboroCity_PokemonCenter_2F/events.inc
diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_2F.inc b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc
index a1bdeba5b..a1bdeba5b 100644
--- a/data/scripts/maps/RustboroCity_PokemonCenter_2F.inc
+++ b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/events/RustboroCity_PokemonSchool.inc b/data/maps/RustboroCity_PokemonSchool/events.inc
index 2deabdb5c..2deabdb5c 100644
--- a/data/maps/events/RustboroCity_PokemonSchool.inc
+++ b/data/maps/RustboroCity_PokemonSchool/events.inc
diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc
index f5030facd..f5030facd 100644
--- a/data/scripts/maps/RustboroCity_PokemonSchool.inc
+++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc
diff --git a/data/maps/events/RusturfTunnel.inc b/data/maps/RusturfTunnel/events.inc
index e294e200e..e294e200e 100644
--- a/data/maps/events/RusturfTunnel.inc
+++ b/data/maps/RusturfTunnel/events.inc
diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/maps/RusturfTunnel/scripts.inc
index 5e42be78d..5e42be78d 100644
--- a/data/scripts/maps/RusturfTunnel.inc
+++ b/data/maps/RusturfTunnel/scripts.inc
diff --git a/data/maps/events/SSTidalCorridor.inc b/data/maps/SSTidalCorridor/events.inc
index 8f0b1de77..8f0b1de77 100644
--- a/data/maps/events/SSTidalCorridor.inc
+++ b/data/maps/SSTidalCorridor/events.inc
diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/maps/SSTidalCorridor/scripts.inc
index 2e1b4cfa4..2e1b4cfa4 100644
--- a/data/scripts/maps/SSTidalCorridor.inc
+++ b/data/maps/SSTidalCorridor/scripts.inc
diff --git a/data/maps/events/SSTidalLowerDeck.inc b/data/maps/SSTidalLowerDeck/events.inc
index 969830d37..969830d37 100644
--- a/data/maps/events/SSTidalLowerDeck.inc
+++ b/data/maps/SSTidalLowerDeck/events.inc
diff --git a/data/scripts/maps/SSTidalLowerDeck.inc b/data/maps/SSTidalLowerDeck/scripts.inc
index 2ad1ed580..2ad1ed580 100644
--- a/data/scripts/maps/SSTidalLowerDeck.inc
+++ b/data/maps/SSTidalLowerDeck/scripts.inc
diff --git a/data/maps/events/SSTidalRooms.inc b/data/maps/SSTidalRooms/events.inc
index a9900294c..a9900294c 100644
--- a/data/maps/events/SSTidalRooms.inc
+++ b/data/maps/SSTidalRooms/events.inc
diff --git a/data/scripts/maps/SSTidalRooms.inc b/data/maps/SSTidalRooms/scripts.inc
index 39c453e98..39c453e98 100644
--- a/data/scripts/maps/SSTidalRooms.inc
+++ b/data/maps/SSTidalRooms/scripts.inc
diff --git a/data/maps/events/SafariZone_North.inc b/data/maps/SafariZone_North/events.inc
index 88b41669b..88b41669b 100644
--- a/data/maps/events/SafariZone_North.inc
+++ b/data/maps/SafariZone_North/events.inc
diff --git a/data/scripts/maps/SafariZone_North.inc b/data/maps/SafariZone_North/scripts.inc
index a96b6b95d..a96b6b95d 100644
--- a/data/scripts/maps/SafariZone_North.inc
+++ b/data/maps/SafariZone_North/scripts.inc
diff --git a/data/maps/events/SafariZone_Northeast.inc b/data/maps/SafariZone_Northeast/events.inc
index e71ba4dd5..e71ba4dd5 100644
--- a/data/maps/events/SafariZone_Northeast.inc
+++ b/data/maps/SafariZone_Northeast/events.inc
diff --git a/data/scripts/maps/SafariZone_Northeast.inc b/data/maps/SafariZone_Northeast/scripts.inc
index 207e2a584..207e2a584 100644
--- a/data/scripts/maps/SafariZone_Northeast.inc
+++ b/data/maps/SafariZone_Northeast/scripts.inc
diff --git a/data/maps/events/SafariZone_Northwest.inc b/data/maps/SafariZone_Northwest/events.inc
index 8e5b242b9..8e5b242b9 100644
--- a/data/maps/events/SafariZone_Northwest.inc
+++ b/data/maps/SafariZone_Northwest/events.inc
diff --git a/data/scripts/maps/SafariZone_Northwest.inc b/data/maps/SafariZone_Northwest/scripts.inc
index 34e510237..34e510237 100644
--- a/data/scripts/maps/SafariZone_Northwest.inc
+++ b/data/maps/SafariZone_Northwest/scripts.inc
diff --git a/data/maps/events/SafariZone_RestHouse.inc b/data/maps/SafariZone_RestHouse/events.inc
index 0607ffcc7..0607ffcc7 100644
--- a/data/maps/events/SafariZone_RestHouse.inc
+++ b/data/maps/SafariZone_RestHouse/events.inc
diff --git a/data/scripts/maps/SafariZone_RestHouse.inc b/data/maps/SafariZone_RestHouse/scripts.inc
index 22657eeb1..22657eeb1 100644
--- a/data/scripts/maps/SafariZone_RestHouse.inc
+++ b/data/maps/SafariZone_RestHouse/scripts.inc
diff --git a/data/maps/events/SafariZone_South.inc b/data/maps/SafariZone_South/events.inc
index 46173d11a..46173d11a 100644
--- a/data/maps/events/SafariZone_South.inc
+++ b/data/maps/SafariZone_South/events.inc
diff --git a/data/scripts/maps/SafariZone_South.inc b/data/maps/SafariZone_South/scripts.inc
index 19f51b873..19f51b873 100644
--- a/data/scripts/maps/SafariZone_South.inc
+++ b/data/maps/SafariZone_South/scripts.inc
diff --git a/data/maps/events/SafariZone_Southeast.inc b/data/maps/SafariZone_Southeast/events.inc
index af2da0575..af2da0575 100644
--- a/data/maps/events/SafariZone_Southeast.inc
+++ b/data/maps/SafariZone_Southeast/events.inc
diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/maps/SafariZone_Southeast/scripts.inc
index f88cd22fb..f88cd22fb 100644
--- a/data/scripts/maps/SafariZone_Southeast.inc
+++ b/data/maps/SafariZone_Southeast/scripts.inc
diff --git a/data/maps/events/SafariZone_Southwest.inc b/data/maps/SafariZone_Southwest/events.inc
index ccd775dd2..ccd775dd2 100644
--- a/data/maps/events/SafariZone_Southwest.inc
+++ b/data/maps/SafariZone_Southwest/events.inc
diff --git a/data/scripts/maps/SafariZone_Southwest.inc b/data/maps/SafariZone_Southwest/scripts.inc
index d2e75eb1b..d2e75eb1b 100644
--- a/data/scripts/maps/SafariZone_Southwest.inc
+++ b/data/maps/SafariZone_Southwest/scripts.inc
diff --git a/data/maps/events/ScorchedSlab.inc b/data/maps/ScorchedSlab/events.inc
index 588b7a9ae..588b7a9ae 100644
--- a/data/maps/events/ScorchedSlab.inc
+++ b/data/maps/ScorchedSlab/events.inc
diff --git a/data/scripts/maps/ScorchedSlab.inc b/data/maps/ScorchedSlab/scripts.inc
index f83724ec5..f83724ec5 100644
--- a/data/scripts/maps/ScorchedSlab.inc
+++ b/data/maps/ScorchedSlab/scripts.inc
diff --git a/data/maps/events/SeafloorCavern_Entrance.inc b/data/maps/SeafloorCavern_Entrance/events.inc
index e27362f00..e27362f00 100644
--- a/data/maps/events/SeafloorCavern_Entrance.inc
+++ b/data/maps/SeafloorCavern_Entrance/events.inc
diff --git a/data/scripts/maps/SeafloorCavern_Entrance.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc
index 9eb71d5e3..9eb71d5e3 100644
--- a/data/scripts/maps/SeafloorCavern_Entrance.inc
+++ b/data/maps/SeafloorCavern_Entrance/scripts.inc
diff --git a/data/maps/events/SeafloorCavern_Room1.inc b/data/maps/SeafloorCavern_Room1/events.inc
index 261314b9b..261314b9b 100644
--- a/data/maps/events/SeafloorCavern_Room1.inc
+++ b/data/maps/SeafloorCavern_Room1/events.inc
diff --git a/data/scripts/maps/SeafloorCavern_Room1.inc b/data/maps/SeafloorCavern_Room1/scripts.inc
index d3308fca2..d3308fca2 100644
--- a/data/scripts/maps/SeafloorCavern_Room1.inc
+++ b/data/maps/SeafloorCavern_Room1/scripts.inc
diff --git a/data/maps/events/SeafloorCavern_Room2.inc b/data/maps/SeafloorCavern_Room2/events.inc
index 01f6f3ba5..01f6f3ba5 100644
--- a/data/maps/events/SeafloorCavern_Room2.inc
+++ b/data/maps/SeafloorCavern_Room2/events.inc
diff --git a/data/scripts/maps/SeafloorCavern_Room2.inc b/data/maps/SeafloorCavern_Room2/scripts.inc
index 15201dac0..15201dac0 100644
--- a/data/scripts/maps/SeafloorCavern_Room2.inc
+++ b/data/maps/SeafloorCavern_Room2/scripts.inc
diff --git a/data/maps/events/SeafloorCavern_Room3.inc b/data/maps/SeafloorCavern_Room3/events.inc
index 300db40c5..300db40c5 100644
--- a/data/maps/events/SeafloorCavern_Room3.inc
+++ b/data/maps/SeafloorCavern_Room3/events.inc
diff --git a/data/scripts/maps/SeafloorCavern_Room3.inc b/data/maps/SeafloorCavern_Room3/scripts.inc
index f57d58e22..f57d58e22 100644
--- a/data/scripts/maps/SeafloorCavern_Room3.inc
+++ b/data/maps/SeafloorCavern_Room3/scripts.inc
diff --git a/data/maps/events/SeafloorCavern_Room4.inc b/data/maps/SeafloorCavern_Room4/events.inc
index 6b6df78f2..6b6df78f2 100644
--- a/data/maps/events/SeafloorCavern_Room4.inc
+++ b/data/maps/SeafloorCavern_Room4/events.inc
diff --git a/data/scripts/maps/SeafloorCavern_Room4.inc b/data/maps/SeafloorCavern_Room4/scripts.inc
index e509013d6..e509013d6 100644
--- a/data/scripts/maps/SeafloorCavern_Room4.inc
+++ b/data/maps/SeafloorCavern_Room4/scripts.inc
diff --git a/data/maps/events/SeafloorCavern_Room5.inc b/data/maps/SeafloorCavern_Room5/events.inc
index 97787ebbf..97787ebbf 100644
--- a/data/maps/events/SeafloorCavern_Room5.inc
+++ b/data/maps/SeafloorCavern_Room5/events.inc
diff --git a/data/scripts/maps/SeafloorCavern_Room5.inc b/data/maps/SeafloorCavern_Room5/scripts.inc
index e1c68db6e..e1c68db6e 100644
--- a/data/scripts/maps/SeafloorCavern_Room5.inc
+++ b/data/maps/SeafloorCavern_Room5/scripts.inc
diff --git a/data/maps/events/SeafloorCavern_Room6.inc b/data/maps/SeafloorCavern_Room6/events.inc
index 99c10d87e..99c10d87e 100644
--- a/data/maps/events/SeafloorCavern_Room6.inc
+++ b/data/maps/SeafloorCavern_Room6/events.inc
diff --git a/data/scripts/maps/SeafloorCavern_Room6.inc b/data/maps/SeafloorCavern_Room6/scripts.inc
index ae8cf02fa..ae8cf02fa 100644
--- a/data/scripts/maps/SeafloorCavern_Room6.inc
+++ b/data/maps/SeafloorCavern_Room6/scripts.inc
diff --git a/data/maps/events/SeafloorCavern_Room7.inc b/data/maps/SeafloorCavern_Room7/events.inc
index 2d8fca999..2d8fca999 100644
--- a/data/maps/events/SeafloorCavern_Room7.inc
+++ b/data/maps/SeafloorCavern_Room7/events.inc
diff --git a/data/scripts/maps/SeafloorCavern_Room7.inc b/data/maps/SeafloorCavern_Room7/scripts.inc
index e91cf6193..e91cf6193 100644
--- a/data/scripts/maps/SeafloorCavern_Room7.inc
+++ b/data/maps/SeafloorCavern_Room7/scripts.inc
diff --git a/data/maps/events/SeafloorCavern_Room8.inc b/data/maps/SeafloorCavern_Room8/events.inc
index 42dcf9faa..42dcf9faa 100644
--- a/data/maps/events/SeafloorCavern_Room8.inc
+++ b/data/maps/SeafloorCavern_Room8/events.inc
diff --git a/data/scripts/maps/SeafloorCavern_Room8.inc b/data/maps/SeafloorCavern_Room8/scripts.inc
index 471cafd17..471cafd17 100644
--- a/data/scripts/maps/SeafloorCavern_Room8.inc
+++ b/data/maps/SeafloorCavern_Room8/scripts.inc
diff --git a/data/maps/events/SeafloorCavern_Room9.inc b/data/maps/SeafloorCavern_Room9/events.inc
index ac3337bed..ac3337bed 100644
--- a/data/maps/events/SeafloorCavern_Room9.inc
+++ b/data/maps/SeafloorCavern_Room9/events.inc
diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/maps/SeafloorCavern_Room9/scripts.inc
index cbfbccfe4..cbfbccfe4 100644
--- a/data/scripts/maps/SeafloorCavern_Room9.inc
+++ b/data/maps/SeafloorCavern_Room9/scripts.inc
diff --git a/data/maps/events/SealedChamber_InnerRoom.inc b/data/maps/SealedChamber_InnerRoom/events.inc
index dd331570e..dd331570e 100644
--- a/data/maps/events/SealedChamber_InnerRoom.inc
+++ b/data/maps/SealedChamber_InnerRoom/events.inc
diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/maps/SealedChamber_InnerRoom/scripts.inc
index 9cd3727bb..9cd3727bb 100644
--- a/data/scripts/maps/SealedChamber_InnerRoom.inc
+++ b/data/maps/SealedChamber_InnerRoom/scripts.inc
diff --git a/data/maps/events/SealedChamber_OuterRoom.inc b/data/maps/SealedChamber_OuterRoom/events.inc
index 0181f3193..0181f3193 100644
--- a/data/maps/events/SealedChamber_OuterRoom.inc
+++ b/data/maps/SealedChamber_OuterRoom/events.inc
diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/maps/SealedChamber_OuterRoom/scripts.inc
index e9e79d1e9..e9e79d1e9 100644
--- a/data/scripts/maps/SealedChamber_OuterRoom.inc
+++ b/data/maps/SealedChamber_OuterRoom/scripts.inc
diff --git a/data/maps/events/SecretBase_BlueCave1.inc b/data/maps/SecretBase_BlueCave1/events.inc
index 2905764cf..2905764cf 100644
--- a/data/maps/events/SecretBase_BlueCave1.inc
+++ b/data/maps/SecretBase_BlueCave1/events.inc
diff --git a/data/scripts/maps/SecretBase_BlueCave1.inc b/data/maps/SecretBase_BlueCave1/scripts.inc
index a7f979bde..a7f979bde 100644
--- a/data/scripts/maps/SecretBase_BlueCave1.inc
+++ b/data/maps/SecretBase_BlueCave1/scripts.inc
diff --git a/data/maps/events/SecretBase_BlueCave2.inc b/data/maps/SecretBase_BlueCave2/events.inc
index 8202b7a42..8202b7a42 100644
--- a/data/maps/events/SecretBase_BlueCave2.inc
+++ b/data/maps/SecretBase_BlueCave2/events.inc
diff --git a/data/scripts/maps/SecretBase_BlueCave2.inc b/data/maps/SecretBase_BlueCave2/scripts.inc
index cb4ad3565..cb4ad3565 100644
--- a/data/scripts/maps/SecretBase_BlueCave2.inc
+++ b/data/maps/SecretBase_BlueCave2/scripts.inc
diff --git a/data/maps/events/SecretBase_BlueCave3.inc b/data/maps/SecretBase_BlueCave3/events.inc
index 733b674b7..733b674b7 100644
--- a/data/maps/events/SecretBase_BlueCave3.inc
+++ b/data/maps/SecretBase_BlueCave3/events.inc
diff --git a/data/scripts/maps/SecretBase_BlueCave3.inc b/data/maps/SecretBase_BlueCave3/scripts.inc
index f49ff6dc1..f49ff6dc1 100644
--- a/data/scripts/maps/SecretBase_BlueCave3.inc
+++ b/data/maps/SecretBase_BlueCave3/scripts.inc
diff --git a/data/maps/events/SecretBase_BlueCave4.inc b/data/maps/SecretBase_BlueCave4/events.inc
index afd1622b8..afd1622b8 100644
--- a/data/maps/events/SecretBase_BlueCave4.inc
+++ b/data/maps/SecretBase_BlueCave4/events.inc
diff --git a/data/scripts/maps/SecretBase_BlueCave4.inc b/data/maps/SecretBase_BlueCave4/scripts.inc
index faa808545..faa808545 100644
--- a/data/scripts/maps/SecretBase_BlueCave4.inc
+++ b/data/maps/SecretBase_BlueCave4/scripts.inc
diff --git a/data/maps/events/SecretBase_BrownCave1.inc b/data/maps/SecretBase_BrownCave1/events.inc
index e4fffab49..e4fffab49 100644
--- a/data/maps/events/SecretBase_BrownCave1.inc
+++ b/data/maps/SecretBase_BrownCave1/events.inc
diff --git a/data/scripts/maps/SecretBase_BrownCave1.inc b/data/maps/SecretBase_BrownCave1/scripts.inc
index 9d2925611..9d2925611 100644
--- a/data/scripts/maps/SecretBase_BrownCave1.inc
+++ b/data/maps/SecretBase_BrownCave1/scripts.inc
diff --git a/data/maps/events/SecretBase_BrownCave2.inc b/data/maps/SecretBase_BrownCave2/events.inc
index 29e90b592..29e90b592 100644
--- a/data/maps/events/SecretBase_BrownCave2.inc
+++ b/data/maps/SecretBase_BrownCave2/events.inc
diff --git a/data/scripts/maps/SecretBase_BrownCave2.inc b/data/maps/SecretBase_BrownCave2/scripts.inc
index e9c497fac..e9c497fac 100644
--- a/data/scripts/maps/SecretBase_BrownCave2.inc
+++ b/data/maps/SecretBase_BrownCave2/scripts.inc
diff --git a/data/maps/events/SecretBase_BrownCave3.inc b/data/maps/SecretBase_BrownCave3/events.inc
index 3322b9d5a..3322b9d5a 100644
--- a/data/maps/events/SecretBase_BrownCave3.inc
+++ b/data/maps/SecretBase_BrownCave3/events.inc
diff --git a/data/scripts/maps/SecretBase_BrownCave3.inc b/data/maps/SecretBase_BrownCave3/scripts.inc
index 284262d91..284262d91 100644
--- a/data/scripts/maps/SecretBase_BrownCave3.inc
+++ b/data/maps/SecretBase_BrownCave3/scripts.inc
diff --git a/data/maps/events/SecretBase_BrownCave4.inc b/data/maps/SecretBase_BrownCave4/events.inc
index 310033947..310033947 100644
--- a/data/maps/events/SecretBase_BrownCave4.inc
+++ b/data/maps/SecretBase_BrownCave4/events.inc
diff --git a/data/scripts/maps/SecretBase_BrownCave4.inc b/data/maps/SecretBase_BrownCave4/scripts.inc
index 84f685508..84f685508 100644
--- a/data/scripts/maps/SecretBase_BrownCave4.inc
+++ b/data/maps/SecretBase_BrownCave4/scripts.inc
diff --git a/data/maps/events/SecretBase_RedCave1.inc b/data/maps/SecretBase_RedCave1/events.inc
index eba992586..eba992586 100644
--- a/data/maps/events/SecretBase_RedCave1.inc
+++ b/data/maps/SecretBase_RedCave1/events.inc
diff --git a/data/scripts/maps/SecretBase_RedCave1.inc b/data/maps/SecretBase_RedCave1/scripts.inc
index f9c55a2b5..f9c55a2b5 100644
--- a/data/scripts/maps/SecretBase_RedCave1.inc
+++ b/data/maps/SecretBase_RedCave1/scripts.inc
diff --git a/data/maps/events/SecretBase_RedCave2.inc b/data/maps/SecretBase_RedCave2/events.inc
index c6f534965..c6f534965 100644
--- a/data/maps/events/SecretBase_RedCave2.inc
+++ b/data/maps/SecretBase_RedCave2/events.inc
diff --git a/data/scripts/maps/SecretBase_RedCave2.inc b/data/maps/SecretBase_RedCave2/scripts.inc
index e7e0c7ba5..e7e0c7ba5 100644
--- a/data/scripts/maps/SecretBase_RedCave2.inc
+++ b/data/maps/SecretBase_RedCave2/scripts.inc
diff --git a/data/maps/events/SecretBase_RedCave3.inc b/data/maps/SecretBase_RedCave3/events.inc
index dda054b44..dda054b44 100644
--- a/data/maps/events/SecretBase_RedCave3.inc
+++ b/data/maps/SecretBase_RedCave3/events.inc
diff --git a/data/scripts/maps/SecretBase_RedCave3.inc b/data/maps/SecretBase_RedCave3/scripts.inc
index 512f7f92a..512f7f92a 100644
--- a/data/scripts/maps/SecretBase_RedCave3.inc
+++ b/data/maps/SecretBase_RedCave3/scripts.inc
diff --git a/data/maps/events/SecretBase_RedCave4.inc b/data/maps/SecretBase_RedCave4/events.inc
index 54e33dc3d..54e33dc3d 100644
--- a/data/maps/events/SecretBase_RedCave4.inc
+++ b/data/maps/SecretBase_RedCave4/events.inc
diff --git a/data/scripts/maps/SecretBase_RedCave4.inc b/data/maps/SecretBase_RedCave4/scripts.inc
index 98e79f89f..98e79f89f 100644
--- a/data/scripts/maps/SecretBase_RedCave4.inc
+++ b/data/maps/SecretBase_RedCave4/scripts.inc
diff --git a/data/maps/events/SecretBase_Shrub1.inc b/data/maps/SecretBase_Shrub1/events.inc
index acdac9692..acdac9692 100644
--- a/data/maps/events/SecretBase_Shrub1.inc
+++ b/data/maps/SecretBase_Shrub1/events.inc
diff --git a/data/scripts/maps/SecretBase_Shrub1.inc b/data/maps/SecretBase_Shrub1/scripts.inc
index 24b8685a0..24b8685a0 100644
--- a/data/scripts/maps/SecretBase_Shrub1.inc
+++ b/data/maps/SecretBase_Shrub1/scripts.inc
diff --git a/data/maps/events/SecretBase_Shrub2.inc b/data/maps/SecretBase_Shrub2/events.inc
index a370d2e72..a370d2e72 100644
--- a/data/maps/events/SecretBase_Shrub2.inc
+++ b/data/maps/SecretBase_Shrub2/events.inc
diff --git a/data/scripts/maps/SecretBase_Shrub2.inc b/data/maps/SecretBase_Shrub2/scripts.inc
index dad94f46d..dad94f46d 100644
--- a/data/scripts/maps/SecretBase_Shrub2.inc
+++ b/data/maps/SecretBase_Shrub2/scripts.inc
diff --git a/data/maps/events/SecretBase_Shrub3.inc b/data/maps/SecretBase_Shrub3/events.inc
index 942be3617..942be3617 100644
--- a/data/maps/events/SecretBase_Shrub3.inc
+++ b/data/maps/SecretBase_Shrub3/events.inc
diff --git a/data/scripts/maps/SecretBase_Shrub3.inc b/data/maps/SecretBase_Shrub3/scripts.inc
index 22c67c939..22c67c939 100644
--- a/data/scripts/maps/SecretBase_Shrub3.inc
+++ b/data/maps/SecretBase_Shrub3/scripts.inc
diff --git a/data/maps/events/SecretBase_Shrub4.inc b/data/maps/SecretBase_Shrub4/events.inc
index a027b266b..a027b266b 100644
--- a/data/maps/events/SecretBase_Shrub4.inc
+++ b/data/maps/SecretBase_Shrub4/events.inc
diff --git a/data/scripts/maps/SecretBase_Shrub4.inc b/data/maps/SecretBase_Shrub4/scripts.inc
index 1a9952232..1a9952232 100644
--- a/data/scripts/maps/SecretBase_Shrub4.inc
+++ b/data/maps/SecretBase_Shrub4/scripts.inc
diff --git a/data/maps/events/SecretBase_Tree1.inc b/data/maps/SecretBase_Tree1/events.inc
index 3379e8ecb..3379e8ecb 100644
--- a/data/maps/events/SecretBase_Tree1.inc
+++ b/data/maps/SecretBase_Tree1/events.inc
diff --git a/data/scripts/maps/SecretBase_Tree1.inc b/data/maps/SecretBase_Tree1/scripts.inc
index 7e7704d6a..7e7704d6a 100644
--- a/data/scripts/maps/SecretBase_Tree1.inc
+++ b/data/maps/SecretBase_Tree1/scripts.inc
diff --git a/data/maps/events/SecretBase_Tree2.inc b/data/maps/SecretBase_Tree2/events.inc
index e330951cf..e330951cf 100644
--- a/data/maps/events/SecretBase_Tree2.inc
+++ b/data/maps/SecretBase_Tree2/events.inc
diff --git a/data/scripts/maps/SecretBase_Tree2.inc b/data/maps/SecretBase_Tree2/scripts.inc
index b30a6ec74..b30a6ec74 100644
--- a/data/scripts/maps/SecretBase_Tree2.inc
+++ b/data/maps/SecretBase_Tree2/scripts.inc
diff --git a/data/maps/events/SecretBase_Tree3.inc b/data/maps/SecretBase_Tree3/events.inc
index b4a8c2eb3..b4a8c2eb3 100644
--- a/data/maps/events/SecretBase_Tree3.inc
+++ b/data/maps/SecretBase_Tree3/events.inc
diff --git a/data/scripts/maps/SecretBase_Tree3.inc b/data/maps/SecretBase_Tree3/scripts.inc
index 9512bbb80..9512bbb80 100644
--- a/data/scripts/maps/SecretBase_Tree3.inc
+++ b/data/maps/SecretBase_Tree3/scripts.inc
diff --git a/data/maps/events/SecretBase_Tree4.inc b/data/maps/SecretBase_Tree4/events.inc
index 4c57fcdfd..4c57fcdfd 100644
--- a/data/maps/events/SecretBase_Tree4.inc
+++ b/data/maps/SecretBase_Tree4/events.inc
diff --git a/data/scripts/maps/SecretBase_Tree4.inc b/data/maps/SecretBase_Tree4/scripts.inc
index 62f41627f..62f41627f 100644
--- a/data/scripts/maps/SecretBase_Tree4.inc
+++ b/data/maps/SecretBase_Tree4/scripts.inc
diff --git a/data/maps/events/SecretBase_YellowCave1.inc b/data/maps/SecretBase_YellowCave1/events.inc
index e7f4ed7ce..e7f4ed7ce 100644
--- a/data/maps/events/SecretBase_YellowCave1.inc
+++ b/data/maps/SecretBase_YellowCave1/events.inc
diff --git a/data/scripts/maps/SecretBase_YellowCave1.inc b/data/maps/SecretBase_YellowCave1/scripts.inc
index fa56be0eb..fa56be0eb 100644
--- a/data/scripts/maps/SecretBase_YellowCave1.inc
+++ b/data/maps/SecretBase_YellowCave1/scripts.inc
diff --git a/data/maps/events/SecretBase_YellowCave2.inc b/data/maps/SecretBase_YellowCave2/events.inc
index 84aabf3d4..84aabf3d4 100644
--- a/data/maps/events/SecretBase_YellowCave2.inc
+++ b/data/maps/SecretBase_YellowCave2/events.inc
diff --git a/data/scripts/maps/SecretBase_YellowCave2.inc b/data/maps/SecretBase_YellowCave2/scripts.inc
index 86c3c876f..86c3c876f 100644
--- a/data/scripts/maps/SecretBase_YellowCave2.inc
+++ b/data/maps/SecretBase_YellowCave2/scripts.inc
diff --git a/data/maps/events/SecretBase_YellowCave3.inc b/data/maps/SecretBase_YellowCave3/events.inc
index 2e1d61708..2e1d61708 100644
--- a/data/maps/events/SecretBase_YellowCave3.inc
+++ b/data/maps/SecretBase_YellowCave3/events.inc
diff --git a/data/scripts/maps/SecretBase_YellowCave3.inc b/data/maps/SecretBase_YellowCave3/scripts.inc
index 26311e6c5..26311e6c5 100644
--- a/data/scripts/maps/SecretBase_YellowCave3.inc
+++ b/data/maps/SecretBase_YellowCave3/scripts.inc
diff --git a/data/maps/events/SecretBase_YellowCave4.inc b/data/maps/SecretBase_YellowCave4/events.inc
index 07ac363ac..07ac363ac 100644
--- a/data/maps/events/SecretBase_YellowCave4.inc
+++ b/data/maps/SecretBase_YellowCave4/events.inc
diff --git a/data/scripts/maps/SecretBase_YellowCave4.inc b/data/maps/SecretBase_YellowCave4/scripts.inc
index 32da39388..32da39388 100644
--- a/data/scripts/maps/SecretBase_YellowCave4.inc
+++ b/data/maps/SecretBase_YellowCave4/scripts.inc
diff --git a/data/maps/events/ShoalCave_HighTideEntranceRoom.inc b/data/maps/ShoalCave_HighTideEntranceRoom/events.inc
index e04abe693..e04abe693 100644
--- a/data/maps/events/ShoalCave_HighTideEntranceRoom.inc
+++ b/data/maps/ShoalCave_HighTideEntranceRoom/events.inc
diff --git a/data/scripts/maps/ShoalCave_HighTideEntranceRoom.inc b/data/maps/ShoalCave_HighTideEntranceRoom/scripts.inc
index d2a93f8e9..d2a93f8e9 100644
--- a/data/scripts/maps/ShoalCave_HighTideEntranceRoom.inc
+++ b/data/maps/ShoalCave_HighTideEntranceRoom/scripts.inc
diff --git a/data/maps/events/ShoalCave_HighTideInnerRoom.inc b/data/maps/ShoalCave_HighTideInnerRoom/events.inc
index 20d59a56f..20d59a56f 100644
--- a/data/maps/events/ShoalCave_HighTideInnerRoom.inc
+++ b/data/maps/ShoalCave_HighTideInnerRoom/events.inc
diff --git a/data/scripts/maps/ShoalCave_HighTideInnerRoom.inc b/data/maps/ShoalCave_HighTideInnerRoom/scripts.inc
index 6045f80a6..6045f80a6 100644
--- a/data/scripts/maps/ShoalCave_HighTideInnerRoom.inc
+++ b/data/maps/ShoalCave_HighTideInnerRoom/scripts.inc
diff --git a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc
index 1f4a008e3..1f4a008e3 100644
--- a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc
+++ b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc
diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc
index f57a27c1d..f57a27c1d 100644
--- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc
+++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc
diff --git a/data/maps/events/ShoalCave_LowTideIceRoom.inc b/data/maps/ShoalCave_LowTideIceRoom/events.inc
index 57922e322..57922e322 100644
--- a/data/maps/events/ShoalCave_LowTideIceRoom.inc
+++ b/data/maps/ShoalCave_LowTideIceRoom/events.inc
diff --git a/data/scripts/maps/ShoalCave_LowTideIceRoom.inc b/data/maps/ShoalCave_LowTideIceRoom/scripts.inc
index 3f7a5cce8..3f7a5cce8 100644
--- a/data/scripts/maps/ShoalCave_LowTideIceRoom.inc
+++ b/data/maps/ShoalCave_LowTideIceRoom/scripts.inc
diff --git a/data/maps/events/ShoalCave_LowTideInnerRoom.inc b/data/maps/ShoalCave_LowTideInnerRoom/events.inc
index f1d894264..f1d894264 100644
--- a/data/maps/events/ShoalCave_LowTideInnerRoom.inc
+++ b/data/maps/ShoalCave_LowTideInnerRoom/events.inc
diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
index 94505a96d..94505a96d 100644
--- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc
+++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
diff --git a/data/maps/events/ShoalCave_LowTideLowerRoom.inc b/data/maps/ShoalCave_LowTideLowerRoom/events.inc
index d3d656452..d3d656452 100644
--- a/data/maps/events/ShoalCave_LowTideLowerRoom.inc
+++ b/data/maps/ShoalCave_LowTideLowerRoom/events.inc
diff --git a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc
index 9883bf3da..9883bf3da 100644
--- a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc
+++ b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc
diff --git a/data/maps/events/ShoalCave_LowTideStairsRoom.inc b/data/maps/ShoalCave_LowTideStairsRoom/events.inc
index 875f337a5..875f337a5 100644
--- a/data/maps/events/ShoalCave_LowTideStairsRoom.inc
+++ b/data/maps/ShoalCave_LowTideStairsRoom/events.inc
diff --git a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc
index e8c87bd98..e8c87bd98 100644
--- a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc
+++ b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc
diff --git a/data/maps/events/SingleBattleColosseum.inc b/data/maps/SingleBattleColosseum/events.inc
index 4ef0de89f..4ef0de89f 100644
--- a/data/maps/events/SingleBattleColosseum.inc
+++ b/data/maps/SingleBattleColosseum/events.inc
diff --git a/data/scripts/maps/SingleBattleColosseum.inc b/data/maps/SingleBattleColosseum/scripts.inc
index 06ed3ef16..06ed3ef16 100644
--- a/data/scripts/maps/SingleBattleColosseum.inc
+++ b/data/maps/SingleBattleColosseum/scripts.inc
diff --git a/data/maps/events/SkyPillar_1F.inc b/data/maps/SkyPillar_1F/events.inc
index 59ac1aac0..59ac1aac0 100644
--- a/data/maps/events/SkyPillar_1F.inc
+++ b/data/maps/SkyPillar_1F/events.inc
diff --git a/data/scripts/maps/SkyPillar_1F.inc b/data/maps/SkyPillar_1F/scripts.inc
index 6afc5aa64..6afc5aa64 100644
--- a/data/scripts/maps/SkyPillar_1F.inc
+++ b/data/maps/SkyPillar_1F/scripts.inc
diff --git a/data/maps/events/SkyPillar_2F.inc b/data/maps/SkyPillar_2F/events.inc
index 780db9ccc..780db9ccc 100644
--- a/data/maps/events/SkyPillar_2F.inc
+++ b/data/maps/SkyPillar_2F/events.inc
diff --git a/data/scripts/maps/SkyPillar_2F.inc b/data/maps/SkyPillar_2F/scripts.inc
index c15f1f8c4..c15f1f8c4 100644
--- a/data/scripts/maps/SkyPillar_2F.inc
+++ b/data/maps/SkyPillar_2F/scripts.inc
diff --git a/data/maps/events/SkyPillar_3F.inc b/data/maps/SkyPillar_3F/events.inc
index 2e7697395..2e7697395 100644
--- a/data/maps/events/SkyPillar_3F.inc
+++ b/data/maps/SkyPillar_3F/events.inc
diff --git a/data/scripts/maps/SkyPillar_3F.inc b/data/maps/SkyPillar_3F/scripts.inc
index 0ddae05b2..0ddae05b2 100644
--- a/data/scripts/maps/SkyPillar_3F.inc
+++ b/data/maps/SkyPillar_3F/scripts.inc
diff --git a/data/maps/events/SkyPillar_4F.inc b/data/maps/SkyPillar_4F/events.inc
index 248e36f95..248e36f95 100644
--- a/data/maps/events/SkyPillar_4F.inc
+++ b/data/maps/SkyPillar_4F/events.inc
diff --git a/data/scripts/maps/SkyPillar_4F.inc b/data/maps/SkyPillar_4F/scripts.inc
index 3884864d7..3884864d7 100644
--- a/data/scripts/maps/SkyPillar_4F.inc
+++ b/data/maps/SkyPillar_4F/scripts.inc
diff --git a/data/maps/events/SkyPillar_5F.inc b/data/maps/SkyPillar_5F/events.inc
index c0acb14c0..c0acb14c0 100644
--- a/data/maps/events/SkyPillar_5F.inc
+++ b/data/maps/SkyPillar_5F/events.inc
diff --git a/data/scripts/maps/SkyPillar_5F.inc b/data/maps/SkyPillar_5F/scripts.inc
index 8e08fb2bd..8e08fb2bd 100644
--- a/data/scripts/maps/SkyPillar_5F.inc
+++ b/data/maps/SkyPillar_5F/scripts.inc
diff --git a/data/maps/events/SkyPillar_Entrance.inc b/data/maps/SkyPillar_Entrance/events.inc
index 92cf0da9b..92cf0da9b 100644
--- a/data/maps/events/SkyPillar_Entrance.inc
+++ b/data/maps/SkyPillar_Entrance/events.inc
diff --git a/data/scripts/maps/SkyPillar_Entrance.inc b/data/maps/SkyPillar_Entrance/scripts.inc
index 09ee9eae2..09ee9eae2 100644
--- a/data/scripts/maps/SkyPillar_Entrance.inc
+++ b/data/maps/SkyPillar_Entrance/scripts.inc
diff --git a/data/maps/events/SkyPillar_Outside.inc b/data/maps/SkyPillar_Outside/events.inc
index 4fb4cc010..4fb4cc010 100644
--- a/data/maps/events/SkyPillar_Outside.inc
+++ b/data/maps/SkyPillar_Outside/events.inc
diff --git a/data/scripts/maps/SkyPillar_Outside.inc b/data/maps/SkyPillar_Outside/scripts.inc
index e9fbf4ad6..e9fbf4ad6 100644
--- a/data/scripts/maps/SkyPillar_Outside.inc
+++ b/data/maps/SkyPillar_Outside/scripts.inc
diff --git a/data/maps/events/SkyPillar_Top.inc b/data/maps/SkyPillar_Top/events.inc
index 26bccf67f..26bccf67f 100644
--- a/data/maps/events/SkyPillar_Top.inc
+++ b/data/maps/SkyPillar_Top/events.inc
diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/maps/SkyPillar_Top/scripts.inc
index 334acc8ac..334acc8ac 100644
--- a/data/scripts/maps/SkyPillar_Top.inc
+++ b/data/maps/SkyPillar_Top/scripts.inc
diff --git a/data/maps/events/SlateportCity.inc b/data/maps/SlateportCity/events.inc
index b8480dfb6..b8480dfb6 100644
--- a/data/maps/events/SlateportCity.inc
+++ b/data/maps/SlateportCity/events.inc
diff --git a/data/scripts/maps/SlateportCity.inc b/data/maps/SlateportCity/scripts.inc
index 9a5e41b15..9a5e41b15 100644
--- a/data/scripts/maps/SlateportCity.inc
+++ b/data/maps/SlateportCity/scripts.inc
diff --git a/data/maps/events/SlateportCity_BattleTentBattleRoom.inc b/data/maps/SlateportCity_BattleTentBattleRoom/events.inc
index ce13a5899..ce13a5899 100644
--- a/data/maps/events/SlateportCity_BattleTentBattleRoom.inc
+++ b/data/maps/SlateportCity_BattleTentBattleRoom/events.inc
diff --git a/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
index 150cc425b..150cc425b 100644
--- a/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc
+++ b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
diff --git a/data/maps/events/SlateportCity_BattleTentCorridor.inc b/data/maps/SlateportCity_BattleTentCorridor/events.inc
index b56b50a0e..b56b50a0e 100644
--- a/data/maps/events/SlateportCity_BattleTentCorridor.inc
+++ b/data/maps/SlateportCity_BattleTentCorridor/events.inc
diff --git a/data/scripts/maps/SlateportCity_BattleTentCorridor.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc
index 0a9eb6cf5..0a9eb6cf5 100644
--- a/data/scripts/maps/SlateportCity_BattleTentCorridor.inc
+++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc
diff --git a/data/maps/events/SlateportCity_BattleTentLobby.inc b/data/maps/SlateportCity_BattleTentLobby/events.inc
index 0ceca119b..0ceca119b 100644
--- a/data/maps/events/SlateportCity_BattleTentLobby.inc
+++ b/data/maps/SlateportCity_BattleTentLobby/events.inc
diff --git a/data/scripts/maps/SlateportCity_BattleTentLobby.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc
index fc66d7387..fc66d7387 100644
--- a/data/scripts/maps/SlateportCity_BattleTentLobby.inc
+++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc
diff --git a/data/maps/events/SlateportCity_Harbor.inc b/data/maps/SlateportCity_Harbor/events.inc
index af274e22f..af274e22f 100644
--- a/data/maps/events/SlateportCity_Harbor.inc
+++ b/data/maps/SlateportCity_Harbor/events.inc
diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/maps/SlateportCity_Harbor/scripts.inc
index e1f373bb2..e1f373bb2 100644
--- a/data/scripts/maps/SlateportCity_Harbor.inc
+++ b/data/maps/SlateportCity_Harbor/scripts.inc
diff --git a/data/maps/events/SlateportCity_House1.inc b/data/maps/SlateportCity_House1/events.inc
index 493bb2922..493bb2922 100644
--- a/data/maps/events/SlateportCity_House1.inc
+++ b/data/maps/SlateportCity_House1/events.inc
diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/maps/SlateportCity_House1/scripts.inc
index 8ecc859f7..8ecc859f7 100644
--- a/data/scripts/maps/SlateportCity_House1.inc
+++ b/data/maps/SlateportCity_House1/scripts.inc
diff --git a/data/maps/events/SlateportCity_House2.inc b/data/maps/SlateportCity_House2/events.inc
index 42d0e3660..42d0e3660 100644
--- a/data/maps/events/SlateportCity_House2.inc
+++ b/data/maps/SlateportCity_House2/events.inc
diff --git a/data/scripts/maps/SlateportCity_House2.inc b/data/maps/SlateportCity_House2/scripts.inc
index 28a05ed38..28a05ed38 100644
--- a/data/scripts/maps/SlateportCity_House2.inc
+++ b/data/maps/SlateportCity_House2/scripts.inc
diff --git a/data/maps/events/SlateportCity_Mart.inc b/data/maps/SlateportCity_Mart/events.inc
index d6391598e..d6391598e 100644
--- a/data/maps/events/SlateportCity_Mart.inc
+++ b/data/maps/SlateportCity_Mart/events.inc
diff --git a/data/scripts/maps/SlateportCity_Mart.inc b/data/maps/SlateportCity_Mart/scripts.inc
index da217f809..da217f809 100644
--- a/data/scripts/maps/SlateportCity_Mart.inc
+++ b/data/maps/SlateportCity_Mart/scripts.inc
diff --git a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc
index cfe385a3c..cfe385a3c 100644
--- a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc
diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
index 4464ee582..4464ee582 100644
--- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
diff --git a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc
index dc0c8a8d9..dc0c8a8d9 100644
--- a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc
diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
index 4172c47ef..4172c47ef 100644
--- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
diff --git a/data/maps/events/SlateportCity_PokemonCenter_1F.inc b/data/maps/SlateportCity_PokemonCenter_1F/events.inc
index f59413aba..f59413aba 100644
--- a/data/maps/events/SlateportCity_PokemonCenter_1F.inc
+++ b/data/maps/SlateportCity_PokemonCenter_1F/events.inc
diff --git a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc
index 404804c57..404804c57 100644
--- a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc
+++ b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc
diff --git a/data/maps/events/SlateportCity_PokemonCenter_2F.inc b/data/maps/SlateportCity_PokemonCenter_2F/events.inc
index f59512311..f59512311 100644
--- a/data/maps/events/SlateportCity_PokemonCenter_2F.inc
+++ b/data/maps/SlateportCity_PokemonCenter_2F/events.inc
diff --git a/data/scripts/maps/SlateportCity_PokemonCenter_2F.inc b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc
index 3138f20d6..3138f20d6 100644
--- a/data/scripts/maps/SlateportCity_PokemonCenter_2F.inc
+++ b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/events/SlateportCity_PokemonFanClub.inc b/data/maps/SlateportCity_PokemonFanClub/events.inc
index 92974f5b4..92974f5b4 100644
--- a/data/maps/events/SlateportCity_PokemonFanClub.inc
+++ b/data/maps/SlateportCity_PokemonFanClub/events.inc
diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc
index 307f42af5..307f42af5 100644
--- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc
+++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc
diff --git a/data/maps/events/SlateportCity_SternsShipyard_1F.inc b/data/maps/SlateportCity_SternsShipyard_1F/events.inc
index b231f9816..b231f9816 100644
--- a/data/maps/events/SlateportCity_SternsShipyard_1F.inc
+++ b/data/maps/SlateportCity_SternsShipyard_1F/events.inc
diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc
index 8197eb873..8197eb873 100644
--- a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc
+++ b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc
diff --git a/data/maps/events/SlateportCity_SternsShipyard_2F.inc b/data/maps/SlateportCity_SternsShipyard_2F/events.inc
index 450f40fe7..450f40fe7 100644
--- a/data/maps/events/SlateportCity_SternsShipyard_2F.inc
+++ b/data/maps/SlateportCity_SternsShipyard_2F/events.inc
diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_2F.inc b/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc
index a599ac9b8..a599ac9b8 100644
--- a/data/scripts/maps/SlateportCity_SternsShipyard_2F.inc
+++ b/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc
diff --git a/data/maps/events/SootopolisCity.inc b/data/maps/SootopolisCity/events.inc
index 96aaefd9c..96aaefd9c 100644
--- a/data/maps/events/SootopolisCity.inc
+++ b/data/maps/SootopolisCity/events.inc
diff --git a/data/scripts/maps/SootopolisCity.inc b/data/maps/SootopolisCity/scripts.inc
index 5de8c7d12..5de8c7d12 100644
--- a/data/scripts/maps/SootopolisCity.inc
+++ b/data/maps/SootopolisCity/scripts.inc
diff --git a/data/maps/events/SootopolisCity_Gym_1F.inc b/data/maps/SootopolisCity_Gym_1F/events.inc
index 925acc34b..925acc34b 100644
--- a/data/maps/events/SootopolisCity_Gym_1F.inc
+++ b/data/maps/SootopolisCity_Gym_1F/events.inc
diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc
index af661890f..af661890f 100644
--- a/data/scripts/maps/SootopolisCity_Gym_1F.inc
+++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc
diff --git a/data/maps/events/SootopolisCity_Gym_B1F.inc b/data/maps/SootopolisCity_Gym_B1F/events.inc
index 1ed20fc94..1ed20fc94 100644
--- a/data/maps/events/SootopolisCity_Gym_B1F.inc
+++ b/data/maps/SootopolisCity_Gym_B1F/events.inc
diff --git a/data/scripts/maps/SootopolisCity_Gym_B1F.inc b/data/maps/SootopolisCity_Gym_B1F/scripts.inc
index 8aaa604e2..8aaa604e2 100644
--- a/data/scripts/maps/SootopolisCity_Gym_B1F.inc
+++ b/data/maps/SootopolisCity_Gym_B1F/scripts.inc
diff --git a/data/maps/events/SootopolisCity_House1.inc b/data/maps/SootopolisCity_House1/events.inc
index 4ddbd23ea..4ddbd23ea 100644
--- a/data/maps/events/SootopolisCity_House1.inc
+++ b/data/maps/SootopolisCity_House1/events.inc
diff --git a/data/scripts/maps/SootopolisCity_House1.inc b/data/maps/SootopolisCity_House1/scripts.inc
index 7c898a0b2..7c898a0b2 100644
--- a/data/scripts/maps/SootopolisCity_House1.inc
+++ b/data/maps/SootopolisCity_House1/scripts.inc
diff --git a/data/maps/events/SootopolisCity_House2.inc b/data/maps/SootopolisCity_House2/events.inc
index 213fe39d3..213fe39d3 100644
--- a/data/maps/events/SootopolisCity_House2.inc
+++ b/data/maps/SootopolisCity_House2/events.inc
diff --git a/data/scripts/maps/SootopolisCity_House2.inc b/data/maps/SootopolisCity_House2/scripts.inc
index 82270ca56..82270ca56 100644
--- a/data/scripts/maps/SootopolisCity_House2.inc
+++ b/data/maps/SootopolisCity_House2/scripts.inc
diff --git a/data/maps/events/SootopolisCity_House3.inc b/data/maps/SootopolisCity_House3/events.inc
index 0feca97cb..0feca97cb 100644
--- a/data/maps/events/SootopolisCity_House3.inc
+++ b/data/maps/SootopolisCity_House3/events.inc
diff --git a/data/scripts/maps/SootopolisCity_House3.inc b/data/maps/SootopolisCity_House3/scripts.inc
index 415f90642..415f90642 100644
--- a/data/scripts/maps/SootopolisCity_House3.inc
+++ b/data/maps/SootopolisCity_House3/scripts.inc
diff --git a/data/maps/events/SootopolisCity_House4.inc b/data/maps/SootopolisCity_House4/events.inc
index 1f14ba6e9..1f14ba6e9 100644
--- a/data/maps/events/SootopolisCity_House4.inc
+++ b/data/maps/SootopolisCity_House4/events.inc
diff --git a/data/scripts/maps/SootopolisCity_House4.inc b/data/maps/SootopolisCity_House4/scripts.inc
index e34e6991d..e34e6991d 100644
--- a/data/scripts/maps/SootopolisCity_House4.inc
+++ b/data/maps/SootopolisCity_House4/scripts.inc
diff --git a/data/maps/events/SootopolisCity_House5.inc b/data/maps/SootopolisCity_House5/events.inc
index 566631c02..566631c02 100644
--- a/data/maps/events/SootopolisCity_House5.inc
+++ b/data/maps/SootopolisCity_House5/events.inc
diff --git a/data/scripts/maps/SootopolisCity_House5.inc b/data/maps/SootopolisCity_House5/scripts.inc
index 51da02de1..51da02de1 100644
--- a/data/scripts/maps/SootopolisCity_House5.inc
+++ b/data/maps/SootopolisCity_House5/scripts.inc
diff --git a/data/maps/events/SootopolisCity_House6.inc b/data/maps/SootopolisCity_House6/events.inc
index a85356317..a85356317 100644
--- a/data/maps/events/SootopolisCity_House6.inc
+++ b/data/maps/SootopolisCity_House6/events.inc
diff --git a/data/scripts/maps/SootopolisCity_House6.inc b/data/maps/SootopolisCity_House6/scripts.inc
index 38c8456a3..38c8456a3 100644
--- a/data/scripts/maps/SootopolisCity_House6.inc
+++ b/data/maps/SootopolisCity_House6/scripts.inc
diff --git a/data/maps/events/SootopolisCity_House7.inc b/data/maps/SootopolisCity_House7/events.inc
index 65b0cf9dd..65b0cf9dd 100644
--- a/data/maps/events/SootopolisCity_House7.inc
+++ b/data/maps/SootopolisCity_House7/events.inc
diff --git a/data/scripts/maps/SootopolisCity_House7.inc b/data/maps/SootopolisCity_House7/scripts.inc
index 9df9cde0b..9df9cde0b 100644
--- a/data/scripts/maps/SootopolisCity_House7.inc
+++ b/data/maps/SootopolisCity_House7/scripts.inc
diff --git a/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc
index 84e642bac..84e642bac 100644
--- a/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc
+++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc
diff --git a/data/scripts/maps/SootopolisCity_LotadAndSeedotHouse.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc
index 26a322b89..26a322b89 100644
--- a/data/scripts/maps/SootopolisCity_LotadAndSeedotHouse.inc
+++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc
diff --git a/data/maps/events/SootopolisCity_Mart.inc b/data/maps/SootopolisCity_Mart/events.inc
index 0c32cb482..0c32cb482 100644
--- a/data/maps/events/SootopolisCity_Mart.inc
+++ b/data/maps/SootopolisCity_Mart/events.inc
diff --git a/data/scripts/maps/SootopolisCity_Mart.inc b/data/maps/SootopolisCity_Mart/scripts.inc
index 26ab5497c..26ab5497c 100644
--- a/data/scripts/maps/SootopolisCity_Mart.inc
+++ b/data/maps/SootopolisCity_Mart/scripts.inc
diff --git a/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc
index bf06c2cd9..bf06c2cd9 100644
--- a/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc
diff --git a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
index cdcf5866c..cdcf5866c 100644
--- a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
diff --git a/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc
index 21ea255a4..21ea255a4 100644
--- a/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc
diff --git a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc
index b29ef99a5..b29ef99a5 100644
--- a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc
diff --git a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc
index 9bca02a56..9bca02a56 100644
--- a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc
diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc
index fcb1b5863..fcb1b5863 100644
--- a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc
diff --git a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc
index 8498f9de2..8498f9de2 100644
--- a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc
diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_2F.inc b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc
index 43d8a9d2f..43d8a9d2f 100644
--- a/data/scripts/maps/SootopolisCity_PokemonCenter_2F.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/events/SouthernIsland_Exterior.inc b/data/maps/SouthernIsland_Exterior/events.inc
index 69cddf603..69cddf603 100644
--- a/data/maps/events/SouthernIsland_Exterior.inc
+++ b/data/maps/SouthernIsland_Exterior/events.inc
diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/maps/SouthernIsland_Exterior/scripts.inc
index d303e0614..d303e0614 100644
--- a/data/scripts/maps/SouthernIsland_Exterior.inc
+++ b/data/maps/SouthernIsland_Exterior/scripts.inc
diff --git a/data/maps/events/SouthernIsland_Interior.inc b/data/maps/SouthernIsland_Interior/events.inc
index c31a5568b..c31a5568b 100644
--- a/data/maps/events/SouthernIsland_Interior.inc
+++ b/data/maps/SouthernIsland_Interior/events.inc
diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/maps/SouthernIsland_Interior/scripts.inc
index 432667cc9..432667cc9 100644
--- a/data/scripts/maps/SouthernIsland_Interior.inc
+++ b/data/maps/SouthernIsland_Interior/scripts.inc
diff --git a/data/maps/events/TerraCave_End.inc b/data/maps/TerraCave_End/events.inc
index 61edb1e28..61edb1e28 100644
--- a/data/maps/events/TerraCave_End.inc
+++ b/data/maps/TerraCave_End/events.inc
diff --git a/data/scripts/maps/TerraCave_End.inc b/data/maps/TerraCave_End/scripts.inc
index 5152f85cf..5152f85cf 100644
--- a/data/scripts/maps/TerraCave_End.inc
+++ b/data/maps/TerraCave_End/scripts.inc
diff --git a/data/maps/events/TerraCave_Entrance.inc b/data/maps/TerraCave_Entrance/events.inc
index a176c548d..a176c548d 100644
--- a/data/maps/events/TerraCave_Entrance.inc
+++ b/data/maps/TerraCave_Entrance/events.inc
diff --git a/data/scripts/maps/TerraCave_Entrance.inc b/data/maps/TerraCave_Entrance/scripts.inc
index 1762265ea..1762265ea 100644
--- a/data/scripts/maps/TerraCave_Entrance.inc
+++ b/data/maps/TerraCave_Entrance/scripts.inc
diff --git a/data/maps/events/TradeCenter.inc b/data/maps/TradeCenter/events.inc
index 89e5eac90..89e5eac90 100644
--- a/data/maps/events/TradeCenter.inc
+++ b/data/maps/TradeCenter/events.inc
diff --git a/data/scripts/maps/TradeCenter.inc b/data/maps/TradeCenter/scripts.inc
index e0e0e7d1e..e0e0e7d1e 100644
--- a/data/scripts/maps/TradeCenter.inc
+++ b/data/maps/TradeCenter/scripts.inc
diff --git a/data/maps/events/TrainerHill_1F.inc b/data/maps/TrainerHill_1F/events.inc
index 2a2428f57..2a2428f57 100644
--- a/data/maps/events/TrainerHill_1F.inc
+++ b/data/maps/TrainerHill_1F/events.inc
diff --git a/data/scripts/maps/TrainerHill_1F.inc b/data/maps/TrainerHill_1F/scripts.inc
index 465a6d781..465a6d781 100644
--- a/data/scripts/maps/TrainerHill_1F.inc
+++ b/data/maps/TrainerHill_1F/scripts.inc
diff --git a/data/maps/events/TrainerHill_2F.inc b/data/maps/TrainerHill_2F/events.inc
index ca50380d5..ca50380d5 100644
--- a/data/maps/events/TrainerHill_2F.inc
+++ b/data/maps/TrainerHill_2F/events.inc
diff --git a/data/scripts/maps/TrainerHill_2F.inc b/data/maps/TrainerHill_2F/scripts.inc
index ca8eeff72..ca8eeff72 100644
--- a/data/scripts/maps/TrainerHill_2F.inc
+++ b/data/maps/TrainerHill_2F/scripts.inc
diff --git a/data/maps/events/TrainerHill_3F.inc b/data/maps/TrainerHill_3F/events.inc
index e12394655..e12394655 100644
--- a/data/maps/events/TrainerHill_3F.inc
+++ b/data/maps/TrainerHill_3F/events.inc
diff --git a/data/scripts/maps/TrainerHill_3F.inc b/data/maps/TrainerHill_3F/scripts.inc
index 921a8d808..921a8d808 100644
--- a/data/scripts/maps/TrainerHill_3F.inc
+++ b/data/maps/TrainerHill_3F/scripts.inc
diff --git a/data/maps/events/TrainerHill_4F.inc b/data/maps/TrainerHill_4F/events.inc
index e9696de15..e9696de15 100644
--- a/data/maps/events/TrainerHill_4F.inc
+++ b/data/maps/TrainerHill_4F/events.inc
diff --git a/data/scripts/maps/TrainerHill_4F.inc b/data/maps/TrainerHill_4F/scripts.inc
index 0f710152c..0f710152c 100644
--- a/data/scripts/maps/TrainerHill_4F.inc
+++ b/data/maps/TrainerHill_4F/scripts.inc
diff --git a/data/maps/events/TrainerHill_Elevator.inc b/data/maps/TrainerHill_Elevator/events.inc
index 7af4c5425..7af4c5425 100644
--- a/data/maps/events/TrainerHill_Elevator.inc
+++ b/data/maps/TrainerHill_Elevator/events.inc
diff --git a/data/scripts/maps/TrainerHill_Elevator.inc b/data/maps/TrainerHill_Elevator/scripts.inc
index ac2d5c8a7..ac2d5c8a7 100644
--- a/data/scripts/maps/TrainerHill_Elevator.inc
+++ b/data/maps/TrainerHill_Elevator/scripts.inc
diff --git a/data/maps/events/TrainerHill_Entrance.inc b/data/maps/TrainerHill_Entrance/events.inc
index 4b974ce9b..4b974ce9b 100644
--- a/data/maps/events/TrainerHill_Entrance.inc
+++ b/data/maps/TrainerHill_Entrance/events.inc
diff --git a/data/scripts/maps/TrainerHill_Entrance.inc b/data/maps/TrainerHill_Entrance/scripts.inc
index 84543ff2b..84543ff2b 100644
--- a/data/scripts/maps/TrainerHill_Entrance.inc
+++ b/data/maps/TrainerHill_Entrance/scripts.inc
diff --git a/data/maps/events/TrainerHill_Roof.inc b/data/maps/TrainerHill_Roof/events.inc
index c322d7e96..c322d7e96 100644
--- a/data/maps/events/TrainerHill_Roof.inc
+++ b/data/maps/TrainerHill_Roof/events.inc
diff --git a/data/scripts/maps/TrainerHill_Roof.inc b/data/maps/TrainerHill_Roof/scripts.inc
index bdec2f7aa..bdec2f7aa 100644
--- a/data/scripts/maps/TrainerHill_Roof.inc
+++ b/data/maps/TrainerHill_Roof/scripts.inc
diff --git a/data/maps/events/Underwater1.inc b/data/maps/Underwater1/events.inc
index 08cf19a4c..08cf19a4c 100644
--- a/data/maps/events/Underwater1.inc
+++ b/data/maps/Underwater1/events.inc
diff --git a/data/scripts/maps/Underwater1.inc b/data/maps/Underwater1/scripts.inc
index 107a038a8..107a038a8 100644
--- a/data/scripts/maps/Underwater1.inc
+++ b/data/maps/Underwater1/scripts.inc
diff --git a/data/maps/events/Underwater2.inc b/data/maps/Underwater2/events.inc
index 416e9fe86..416e9fe86 100644
--- a/data/maps/events/Underwater2.inc
+++ b/data/maps/Underwater2/events.inc
diff --git a/data/scripts/maps/Underwater2.inc b/data/maps/Underwater2/scripts.inc
index 80c854c63..80c854c63 100644
--- a/data/scripts/maps/Underwater2.inc
+++ b/data/maps/Underwater2/scripts.inc
diff --git a/data/maps/events/Underwater3.inc b/data/maps/Underwater3/events.inc
index ba8ed9508..ba8ed9508 100644
--- a/data/maps/events/Underwater3.inc
+++ b/data/maps/Underwater3/events.inc
diff --git a/data/scripts/maps/Underwater3.inc b/data/maps/Underwater3/scripts.inc
index 463f7a0ff..463f7a0ff 100644
--- a/data/scripts/maps/Underwater3.inc
+++ b/data/maps/Underwater3/scripts.inc
diff --git a/data/maps/events/Underwater4.inc b/data/maps/Underwater4/events.inc
index 5f8b99b64..5f8b99b64 100644
--- a/data/maps/events/Underwater4.inc
+++ b/data/maps/Underwater4/events.inc
diff --git a/data/scripts/maps/Underwater4.inc b/data/maps/Underwater4/scripts.inc
index 295c27356..295c27356 100644
--- a/data/scripts/maps/Underwater4.inc
+++ b/data/maps/Underwater4/scripts.inc
diff --git a/data/maps/events/Underwater5.inc b/data/maps/Underwater5/events.inc
index 4b902cf96..4b902cf96 100644
--- a/data/maps/events/Underwater5.inc
+++ b/data/maps/Underwater5/events.inc
diff --git a/data/scripts/maps/Underwater5.inc b/data/maps/Underwater5/scripts.inc
index 9d0cc373c..9d0cc373c 100644
--- a/data/scripts/maps/Underwater5.inc
+++ b/data/maps/Underwater5/scripts.inc
diff --git a/data/maps/events/Underwater6.inc b/data/maps/Underwater6/events.inc
index a624efba3..a624efba3 100644
--- a/data/maps/events/Underwater6.inc
+++ b/data/maps/Underwater6/events.inc
diff --git a/data/scripts/maps/Underwater6.inc b/data/maps/Underwater6/scripts.inc
index 047628c9c..047628c9c 100644
--- a/data/scripts/maps/Underwater6.inc
+++ b/data/maps/Underwater6/scripts.inc
diff --git a/data/maps/events/Underwater7.inc b/data/maps/Underwater7/events.inc
index fba9324f6..fba9324f6 100644
--- a/data/maps/events/Underwater7.inc
+++ b/data/maps/Underwater7/events.inc
diff --git a/data/scripts/maps/Underwater7.inc b/data/maps/Underwater7/scripts.inc
index dd757f98a..dd757f98a 100644
--- a/data/scripts/maps/Underwater7.inc
+++ b/data/maps/Underwater7/scripts.inc
diff --git a/data/maps/events/Underwater_MarineCave.inc b/data/maps/Underwater_MarineCave/events.inc
index 685abaa16..685abaa16 100644
--- a/data/maps/events/Underwater_MarineCave.inc
+++ b/data/maps/Underwater_MarineCave/events.inc
diff --git a/data/scripts/maps/Underwater_MarineCave.inc b/data/maps/Underwater_MarineCave/scripts.inc
index ac96e3a9b..ac96e3a9b 100644
--- a/data/scripts/maps/Underwater_MarineCave.inc
+++ b/data/maps/Underwater_MarineCave/scripts.inc
diff --git a/data/maps/events/Underwater_Route134.inc b/data/maps/Underwater_Route134/events.inc
index 3a5219511..3a5219511 100644
--- a/data/maps/events/Underwater_Route134.inc
+++ b/data/maps/Underwater_Route134/events.inc
diff --git a/data/scripts/maps/Underwater_Route134.inc b/data/maps/Underwater_Route134/scripts.inc
index 786de1757..786de1757 100644
--- a/data/scripts/maps/Underwater_Route134.inc
+++ b/data/maps/Underwater_Route134/scripts.inc
diff --git a/data/maps/events/Underwater_SeafloorCavern.inc b/data/maps/Underwater_SeafloorCavern/events.inc
index a22465ca0..a22465ca0 100644
--- a/data/maps/events/Underwater_SeafloorCavern.inc
+++ b/data/maps/Underwater_SeafloorCavern/events.inc
diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/maps/Underwater_SeafloorCavern/scripts.inc
index 128cb31c0..128cb31c0 100644
--- a/data/scripts/maps/Underwater_SeafloorCavern.inc
+++ b/data/maps/Underwater_SeafloorCavern/scripts.inc
diff --git a/data/maps/events/Underwater_SealedChamber.inc b/data/maps/Underwater_SealedChamber/events.inc
index 350cca5d6..350cca5d6 100644
--- a/data/maps/events/Underwater_SealedChamber.inc
+++ b/data/maps/Underwater_SealedChamber/events.inc
diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/maps/Underwater_SealedChamber/scripts.inc
index 7ac032c5f..7ac032c5f 100644
--- a/data/scripts/maps/Underwater_SealedChamber.inc
+++ b/data/maps/Underwater_SealedChamber/scripts.inc
diff --git a/data/maps/events/Underwater_SootopolisCity.inc b/data/maps/Underwater_SootopolisCity/events.inc
index 78839e8a1..78839e8a1 100644
--- a/data/maps/events/Underwater_SootopolisCity.inc
+++ b/data/maps/Underwater_SootopolisCity/events.inc
diff --git a/data/scripts/maps/Underwater_SootopolisCity.inc b/data/maps/Underwater_SootopolisCity/scripts.inc
index cbeefcb1d..cbeefcb1d 100644
--- a/data/scripts/maps/Underwater_SootopolisCity.inc
+++ b/data/maps/Underwater_SootopolisCity/scripts.inc
diff --git a/data/maps/events/UnionRoom.inc b/data/maps/UnionRoom/events.inc
index 1a50ea7d8..1a50ea7d8 100644
--- a/data/maps/events/UnionRoom.inc
+++ b/data/maps/UnionRoom/events.inc
diff --git a/data/scripts/maps/UnionRoom.inc b/data/maps/UnionRoom/scripts.inc
index 250b4b402..250b4b402 100644
--- a/data/scripts/maps/UnionRoom.inc
+++ b/data/maps/UnionRoom/scripts.inc
diff --git a/data/maps/events/UnknownMap_25_29.inc b/data/maps/UnknownMap_25_29/events.inc
index 13ea1b8b9..13ea1b8b9 100644
--- a/data/maps/events/UnknownMap_25_29.inc
+++ b/data/maps/UnknownMap_25_29/events.inc
diff --git a/data/scripts/maps/UnknownMap_25_29.inc b/data/maps/UnknownMap_25_29/scripts.inc
index 575e7a898..575e7a898 100644
--- a/data/scripts/maps/UnknownMap_25_29.inc
+++ b/data/maps/UnknownMap_25_29/scripts.inc
diff --git a/data/maps/events/UnknownMap_25_30.inc b/data/maps/UnknownMap_25_30/events.inc
index 0e221e240..0e221e240 100644
--- a/data/maps/events/UnknownMap_25_30.inc
+++ b/data/maps/UnknownMap_25_30/events.inc
diff --git a/data/scripts/maps/UnknownMap_25_30.inc b/data/maps/UnknownMap_25_30/scripts.inc
index dbc73166d..dbc73166d 100644
--- a/data/scripts/maps/UnknownMap_25_30.inc
+++ b/data/maps/UnknownMap_25_30/scripts.inc
diff --git a/data/maps/events/UnknownMap_25_31.inc b/data/maps/UnknownMap_25_31/events.inc
index 99e450de5..99e450de5 100644
--- a/data/maps/events/UnknownMap_25_31.inc
+++ b/data/maps/UnknownMap_25_31/events.inc
diff --git a/data/scripts/maps/UnknownMap_25_31.inc b/data/maps/UnknownMap_25_31/scripts.inc
index cacda4d1f..cacda4d1f 100644
--- a/data/scripts/maps/UnknownMap_25_31.inc
+++ b/data/maps/UnknownMap_25_31/scripts.inc
diff --git a/data/maps/events/UnknownMap_25_32.inc b/data/maps/UnknownMap_25_32/events.inc
index c48eedb17..c48eedb17 100644
--- a/data/maps/events/UnknownMap_25_32.inc
+++ b/data/maps/UnknownMap_25_32/events.inc
diff --git a/data/scripts/maps/UnknownMap_25_32.inc b/data/maps/UnknownMap_25_32/scripts.inc
index e34f454e7..e34f454e7 100644
--- a/data/scripts/maps/UnknownMap_25_32.inc
+++ b/data/maps/UnknownMap_25_32/scripts.inc
diff --git a/data/maps/events/UnknownMap_25_33.inc b/data/maps/UnknownMap_25_33/events.inc
index 14f4571d2..14f4571d2 100644
--- a/data/maps/events/UnknownMap_25_33.inc
+++ b/data/maps/UnknownMap_25_33/events.inc
diff --git a/data/scripts/maps/UnknownMap_25_33.inc b/data/maps/UnknownMap_25_33/scripts.inc
index 086d2d32c..086d2d32c 100644
--- a/data/scripts/maps/UnknownMap_25_33.inc
+++ b/data/maps/UnknownMap_25_33/scripts.inc
diff --git a/data/maps/events/UnknownMap_25_34.inc b/data/maps/UnknownMap_25_34/events.inc
index 975f08470..975f08470 100644
--- a/data/maps/events/UnknownMap_25_34.inc
+++ b/data/maps/UnknownMap_25_34/events.inc
diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/maps/UnknownMap_25_34/scripts.inc
index eb6bf8da4..eb6bf8da4 100644
--- a/data/scripts/maps/UnknownMap_25_34.inc
+++ b/data/maps/UnknownMap_25_34/scripts.inc
diff --git a/data/maps/events/VerdanturfTown.inc b/data/maps/VerdanturfTown/events.inc
index c844cfa1a..c844cfa1a 100644
--- a/data/maps/events/VerdanturfTown.inc
+++ b/data/maps/VerdanturfTown/events.inc
diff --git a/data/scripts/maps/VerdanturfTown.inc b/data/maps/VerdanturfTown/scripts.inc
index 2987a9a59..2987a9a59 100644
--- a/data/scripts/maps/VerdanturfTown.inc
+++ b/data/maps/VerdanturfTown/scripts.inc
diff --git a/data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc
index 6276192b3..6276192b3 100644
--- a/data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc
+++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc
diff --git a/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
index b7f687cdf..b7f687cdf 100644
--- a/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc
+++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
diff --git a/data/maps/events/VerdanturfTown_BattleTentCorridor.inc b/data/maps/VerdanturfTown_BattleTentCorridor/events.inc
index 4fa836d58..4fa836d58 100644
--- a/data/maps/events/VerdanturfTown_BattleTentCorridor.inc
+++ b/data/maps/VerdanturfTown_BattleTentCorridor/events.inc
diff --git a/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc b/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc
index a4c2e502c..a4c2e502c 100644
--- a/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc
+++ b/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc
diff --git a/data/maps/events/VerdanturfTown_BattleTentLobby.inc b/data/maps/VerdanturfTown_BattleTentLobby/events.inc
index 570e600fe..570e600fe 100644
--- a/data/maps/events/VerdanturfTown_BattleTentLobby.inc
+++ b/data/maps/VerdanturfTown_BattleTentLobby/events.inc
diff --git a/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc
index 26f0680a0..26f0680a0 100644
--- a/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc
+++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc
diff --git a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc
index fd5fa0292..fd5fa0292 100644
--- a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc
+++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc
diff --git a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc
index 28030d869..28030d869 100644
--- a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc
+++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc
diff --git a/data/maps/events/VerdanturfTown_House.inc b/data/maps/VerdanturfTown_House/events.inc
index 49b8d47ee..49b8d47ee 100644
--- a/data/maps/events/VerdanturfTown_House.inc
+++ b/data/maps/VerdanturfTown_House/events.inc
diff --git a/data/scripts/maps/VerdanturfTown_House.inc b/data/maps/VerdanturfTown_House/scripts.inc
index ce48fd662..ce48fd662 100644
--- a/data/scripts/maps/VerdanturfTown_House.inc
+++ b/data/maps/VerdanturfTown_House/scripts.inc
diff --git a/data/maps/events/VerdanturfTown_Mart.inc b/data/maps/VerdanturfTown_Mart/events.inc
index 804f39647..804f39647 100644
--- a/data/maps/events/VerdanturfTown_Mart.inc
+++ b/data/maps/VerdanturfTown_Mart/events.inc
diff --git a/data/scripts/maps/VerdanturfTown_Mart.inc b/data/maps/VerdanturfTown_Mart/scripts.inc
index 96daf2c84..96daf2c84 100644
--- a/data/scripts/maps/VerdanturfTown_Mart.inc
+++ b/data/maps/VerdanturfTown_Mart/scripts.inc
diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc
index 77bd6748c..77bd6748c 100644
--- a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc
diff --git a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc
index 73c7fe1f3..73c7fe1f3 100644
--- a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc
diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc
index 40cbe6aec..40cbe6aec 100644
--- a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc
diff --git a/data/scripts/maps/VerdanturfTown_PokemonCenter_2F.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc
index 9e93a628e..9e93a628e 100644
--- a/data/scripts/maps/VerdanturfTown_PokemonCenter_2F.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/events/VerdanturfTown_WandasHouse.inc b/data/maps/VerdanturfTown_WandasHouse/events.inc
index cfa46e102..cfa46e102 100644
--- a/data/maps/events/VerdanturfTown_WandasHouse.inc
+++ b/data/maps/VerdanturfTown_WandasHouse/events.inc
diff --git a/data/scripts/maps/VerdanturfTown_WandasHouse.inc b/data/maps/VerdanturfTown_WandasHouse/scripts.inc
index fabff6420..fabff6420 100644
--- a/data/scripts/maps/VerdanturfTown_WandasHouse.inc
+++ b/data/maps/VerdanturfTown_WandasHouse/scripts.inc
diff --git a/data/maps/events/VictoryRoad_1F.inc b/data/maps/VictoryRoad_1F/events.inc
index d5fa881dc..d5fa881dc 100644
--- a/data/maps/events/VictoryRoad_1F.inc
+++ b/data/maps/VictoryRoad_1F/events.inc
diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/maps/VictoryRoad_1F/scripts.inc
index 2ed1c6baf..2ed1c6baf 100644
--- a/data/scripts/maps/VictoryRoad_1F.inc
+++ b/data/maps/VictoryRoad_1F/scripts.inc
diff --git a/data/maps/events/VictoryRoad_B1F.inc b/data/maps/VictoryRoad_B1F/events.inc
index 26d67171d..26d67171d 100644
--- a/data/maps/events/VictoryRoad_B1F.inc
+++ b/data/maps/VictoryRoad_B1F/events.inc
diff --git a/data/scripts/maps/VictoryRoad_B1F.inc b/data/maps/VictoryRoad_B1F/scripts.inc
index 376fda7d5..376fda7d5 100644
--- a/data/scripts/maps/VictoryRoad_B1F.inc
+++ b/data/maps/VictoryRoad_B1F/scripts.inc
diff --git a/data/maps/events/VictoryRoad_B2F.inc b/data/maps/VictoryRoad_B2F/events.inc
index a25c76c81..a25c76c81 100644
--- a/data/maps/events/VictoryRoad_B2F.inc
+++ b/data/maps/VictoryRoad_B2F/events.inc
diff --git a/data/scripts/maps/VictoryRoad_B2F.inc b/data/maps/VictoryRoad_B2F/scripts.inc
index 15deea104..15deea104 100644
--- a/data/scripts/maps/VictoryRoad_B2F.inc
+++ b/data/maps/VictoryRoad_B2F/scripts.inc