399 files changed, 398 insertions, 397 deletions

diff --git a/data/maps/_assets.inc b/data/layouts.inc
index aec54aaab..aec54aaab 100644
--- a/data/maps/_assets.inc
+++ b/data/layouts.inc
diff --git a/data/maps/attributes_table.inc b/data/layouts_table.inc
index b1a15d7ef..b1a15d7ef 100644
--- a/data/maps/attributes_table.inc
+++ b/data/layouts_table.inc
diff --git a/data/map_events.s b/data/map_events.s
index 02050c401..e6fe363f8 100644
--- a/data/map_events.s
+++ b/data/map_events.s
@@ -5,402 +5,403 @@
 #include "constants/secret_bases.h"
 #include "constants/vars.h"
 #include "constants/weather.h"
+
 	.include "include/macros.inc"
 	.include "constants/constants.inc"
 
 	.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/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_ContestLobby.inc"
-	.include "data/maps/events/FallarborTown_ContestHall.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_ContestLobby.inc"
-	.include "data/maps/events/VerdanturfTown_ContestHall.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_ContestLobby.inc"
-	.include "data/maps/events/SlateportCity_ContestHall.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_EmptyMap.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_House8.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_Corridor1.inc"
-	.include "data/maps/events/EverGrandeCity_Corridor2.inc"
-	.include "data/maps/events/EverGrandeCity_Corridor3.inc"
-	.include "data/maps/events/EverGrandeCity_Corridor4.inc"
-	.include "data/maps/events/EverGrandeCity_Corridor5.inc"
-	.include "data/maps/events/EverGrandeCity_PokemonLeague.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/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_B1F.inc"
-	.include "data/maps/events/CaveOfOrigin_B2F.inc"
-	.include "data/maps/events/CaveOfOrigin_B3F.inc"
-	.include "data/maps/events/CaveOfOrigin_B4F.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/MagmaHideout_1F.inc"
-	.include "data/maps/events/MagmaHideout_B1F.inc"
-	.include "data/maps/events/MagmaHideout_B2F.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/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/SafariZone_Northwest.inc"
-	.include "data/maps/events/SafariZone_Northeast.inc"
-	.include "data/maps/events/SafariZone_Southwest.inc"
-	.include "data/maps/events/SafariZone_Southeast.inc"
-	.include "data/maps/events/BattleTower_Outside.inc"
-	.include "data/maps/events/BattleTower_Lobby.inc"
-	.include "data/maps/events/BattleTower_Elevator.inc"
-	.include "data/maps/events/BattleTower_Corridor.inc"
-	.include "data/maps/events/BattleTower_BattleRoom.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/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_SeasideCyclingRoadSouthEntrance.inc"
-	.include "data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.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/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_ContestLobby/events.inc"
+	.include "data/maps/FallarborTown_ContestHall/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_ContestLobby/events.inc"
+	.include "data/maps/VerdanturfTown_ContestHall/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_ContestLobby/events.inc"
+	.include "data/maps/SlateportCity_ContestHall/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_EmptyMap/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_House8/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_Corridor1/events.inc"
+	.include "data/maps/EverGrandeCity_Corridor2/events.inc"
+	.include "data/maps/EverGrandeCity_Corridor3/events.inc"
+	.include "data/maps/EverGrandeCity_Corridor4/events.inc"
+	.include "data/maps/EverGrandeCity_Corridor5/events.inc"
+	.include "data/maps/EverGrandeCity_PokemonLeague/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/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_B1F/events.inc"
+	.include "data/maps/CaveOfOrigin_B2F/events.inc"
+	.include "data/maps/CaveOfOrigin_B3F/events.inc"
+	.include "data/maps/CaveOfOrigin_B4F/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/MagmaHideout_1F/events.inc"
+	.include "data/maps/MagmaHideout_B1F/events.inc"
+	.include "data/maps/MagmaHideout_B2F/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/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/SafariZone_Northwest/events.inc"
+	.include "data/maps/SafariZone_Northeast/events.inc"
+	.include "data/maps/SafariZone_Southwest/events.inc"
+	.include "data/maps/SafariZone_Southeast/events.inc"
+	.include "data/maps/BattleTower_Outside/events.inc"
+	.include "data/maps/BattleTower_Lobby/events.inc"
+	.include "data/maps/BattleTower_Elevator/events.inc"
+	.include "data/maps/BattleTower_Corridor/events.inc"
+	.include "data/maps/BattleTower_BattleRoom/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/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_SeasideCyclingRoadSouthEntrance/events.inc"
+	.include "data/maps/Route110_SeasideCyclingRoadNorthEntrance/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.s b/data/maps.s
index 727a48d0f..f8be7f31f 100644
--- a/data/maps.s
+++ b/data/maps.s
@@ -5,8 +5,8 @@
 
 	.section .rodata
 
-	.include "data/maps/_assets.inc"
-	.include "data/maps/attributes_table.inc"
+	.include "data/layouts.inc"
+	.include "data/layouts_table.inc"
 	.include "data/maps/headers.inc"
-	.include "data/maps/_groups.inc"
+	.include "data/maps/groups.inc"
 	.include "data/maps/connections.inc"
diff --git a/data/maps/events/AbandonedShip_CaptainsOffice.inc b/data/maps/AbandonedShip_CaptainsOffice/events.inc
index 791ab9754..791ab9754 100644
--- a/data/maps/events/AbandonedShip_CaptainsOffice.inc
+++ b/data/maps/AbandonedShip_CaptainsOffice/events.inc
diff --git a/data/maps/events/AbandonedShip_Corridors_1F.inc b/data/maps/AbandonedShip_Corridors_1F/events.inc
index 82af88bce..82af88bce 100644
--- a/data/maps/events/AbandonedShip_Corridors_1F.inc
+++ b/data/maps/AbandonedShip_Corridors_1F/events.inc
diff --git a/data/maps/events/AbandonedShip_Corridors_B1F.inc b/data/maps/AbandonedShip_Corridors_B1F/events.inc
index 35dc34437..35dc34437 100644
--- a/data/maps/events/AbandonedShip_Corridors_B1F.inc
+++ b/data/maps/AbandonedShip_Corridors_B1F/events.inc
diff --git a/data/maps/events/AbandonedShip_Deck.inc b/data/maps/AbandonedShip_Deck/events.inc
index 15f54114b..15f54114b 100644
--- a/data/maps/events/AbandonedShip_Deck.inc
+++ b/data/maps/AbandonedShip_Deck/events.inc
diff --git a/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc
index 97bdf37c5..97bdf37c5 100644
--- a/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc
diff --git a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc
index 7c8135e89..7c8135e89 100644
--- a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc
diff --git a/data/maps/events/AbandonedShip_Room_B1F.inc b/data/maps/AbandonedShip_Room_B1F/events.inc
index e828890a5..e828890a5 100644
--- a/data/maps/events/AbandonedShip_Room_B1F.inc
+++ b/data/maps/AbandonedShip_Room_B1F/events.inc
diff --git a/data/maps/events/AbandonedShip_Rooms2_1F.inc b/data/maps/AbandonedShip_Rooms2_1F/events.inc
index e29bd3b42..e29bd3b42 100644
--- a/data/maps/events/AbandonedShip_Rooms2_1F.inc
+++ b/data/maps/AbandonedShip_Rooms2_1F/events.inc
diff --git a/data/maps/events/AbandonedShip_Rooms2_B1F.inc b/data/maps/AbandonedShip_Rooms2_B1F/events.inc
index aa6eb759a..aa6eb759a 100644
--- a/data/maps/events/AbandonedShip_Rooms2_B1F.inc
+++ b/data/maps/AbandonedShip_Rooms2_B1F/events.inc
diff --git a/data/maps/events/AbandonedShip_Rooms_1F.inc b/data/maps/AbandonedShip_Rooms_1F/events.inc
index 6ffe06615..6ffe06615 100644
--- a/data/maps/events/AbandonedShip_Rooms_1F.inc
+++ b/data/maps/AbandonedShip_Rooms_1F/events.inc
diff --git a/data/maps/events/AbandonedShip_Rooms_B1F.inc b/data/maps/AbandonedShip_Rooms_B1F/events.inc
index 405506b44..405506b44 100644
--- a/data/maps/events/AbandonedShip_Rooms_B1F.inc
+++ b/data/maps/AbandonedShip_Rooms_B1F/events.inc
diff --git a/data/maps/events/AbandonedShip_Underwater1.inc b/data/maps/AbandonedShip_Underwater1/events.inc
index 17a89c2aa..17a89c2aa 100644
--- a/data/maps/events/AbandonedShip_Underwater1.inc
+++ b/data/maps/AbandonedShip_Underwater1/events.inc
diff --git a/data/maps/events/AbandonedShip_Underwater2.inc b/data/maps/AbandonedShip_Underwater2/events.inc
index 6eb94059c..6eb94059c 100644
--- a/data/maps/events/AbandonedShip_Underwater2.inc
+++ b/data/maps/AbandonedShip_Underwater2/events.inc
diff --git a/data/maps/events/AncientTomb.inc b/data/maps/AncientTomb/events.inc
index 2699b9036..2699b9036 100644
--- a/data/maps/events/AncientTomb.inc
+++ b/data/maps/AncientTomb/events.inc
diff --git a/data/maps/events/AquaHideout_1F.inc b/data/maps/AquaHideout_1F/events.inc
index 3c87be0d7..3c87be0d7 100644
--- a/data/maps/events/AquaHideout_1F.inc
+++ b/data/maps/AquaHideout_1F/events.inc
diff --git a/data/maps/events/AquaHideout_B1F.inc b/data/maps/AquaHideout_B1F/events.inc
index 0a53d4cf9..0a53d4cf9 100644
--- a/data/maps/events/AquaHideout_B1F.inc
+++ b/data/maps/AquaHideout_B1F/events.inc
diff --git a/data/maps/events/AquaHideout_B2F.inc b/data/maps/AquaHideout_B2F/events.inc
index 6eee30658..6eee30658 100644
--- a/data/maps/events/AquaHideout_B2F.inc
+++ b/data/maps/AquaHideout_B2F/events.inc
diff --git a/data/maps/events/BattleTower_BattleRoom.inc b/data/maps/BattleTower_BattleRoom/events.inc
index a4bbe9849..a4bbe9849 100644
--- a/data/maps/events/BattleTower_BattleRoom.inc
+++ b/data/maps/BattleTower_BattleRoom/events.inc
diff --git a/data/maps/events/BattleTower_Corridor.inc b/data/maps/BattleTower_Corridor/events.inc
index 1233ff32c..1233ff32c 100644
--- a/data/maps/events/BattleTower_Corridor.inc
+++ b/data/maps/BattleTower_Corridor/events.inc
diff --git a/data/maps/events/BattleTower_Elevator.inc b/data/maps/BattleTower_Elevator/events.inc
index 57434d3ac..57434d3ac 100644
--- a/data/maps/events/BattleTower_Elevator.inc
+++ b/data/maps/BattleTower_Elevator/events.inc
diff --git a/data/maps/events/BattleTower_Lobby.inc b/data/maps/BattleTower_Lobby/events.inc
index ca33bdf95..ca33bdf95 100644
--- a/data/maps/events/BattleTower_Lobby.inc
+++ b/data/maps/BattleTower_Lobby/events.inc
diff --git a/data/maps/events/BattleTower_Outside.inc b/data/maps/BattleTower_Outside/events.inc
index 2e02fcc1c..2e02fcc1c 100644
--- a/data/maps/events/BattleTower_Outside.inc
+++ b/data/maps/BattleTower_Outside/events.inc
diff --git a/data/maps/events/CaveOfOrigin_1F.inc b/data/maps/CaveOfOrigin_1F/events.inc
index b0d77795c..b0d77795c 100644
--- a/data/maps/events/CaveOfOrigin_1F.inc
+++ b/data/maps/CaveOfOrigin_1F/events.inc
diff --git a/data/maps/events/CaveOfOrigin_B1F.inc b/data/maps/CaveOfOrigin_B1F/events.inc
index a91ee50e4..a91ee50e4 100644
--- a/data/maps/events/CaveOfOrigin_B1F.inc
+++ b/data/maps/CaveOfOrigin_B1F/events.inc
diff --git a/data/maps/events/CaveOfOrigin_B2F.inc b/data/maps/CaveOfOrigin_B2F/events.inc
index 5d03aaaa2..5d03aaaa2 100644
--- a/data/maps/events/CaveOfOrigin_B2F.inc
+++ b/data/maps/CaveOfOrigin_B2F/events.inc
diff --git a/data/maps/events/CaveOfOrigin_B3F.inc b/data/maps/CaveOfOrigin_B3F/events.inc
index dcf831a76..dcf831a76 100644
--- a/data/maps/events/CaveOfOrigin_B3F.inc
+++ b/data/maps/CaveOfOrigin_B3F/events.inc
diff --git a/data/maps/events/CaveOfOrigin_B4F.inc b/data/maps/CaveOfOrigin_B4F/events.inc
index faa146570..faa146570 100644
--- a/data/maps/events/CaveOfOrigin_B4F.inc
+++ b/data/maps/CaveOfOrigin_B4F/events.inc
diff --git a/data/maps/events/CaveOfOrigin_Entrance.inc b/data/maps/CaveOfOrigin_Entrance/events.inc
index cab14e4d7..cab14e4d7 100644
--- a/data/maps/events/CaveOfOrigin_Entrance.inc
+++ b/data/maps/CaveOfOrigin_Entrance/events.inc
diff --git a/data/maps/events/DesertRuins.inc b/data/maps/DesertRuins/events.inc
index b1d8690c1..b1d8690c1 100644
--- a/data/maps/events/DesertRuins.inc
+++ b/data/maps/DesertRuins/events.inc
diff --git a/data/maps/events/DewfordTown.inc b/data/maps/DewfordTown/events.inc
index 5cfb552ee..5cfb552ee 100644
--- a/data/maps/events/DewfordTown.inc
+++ b/data/maps/DewfordTown/events.inc
diff --git a/data/maps/events/DewfordTown_Gym.inc b/data/maps/DewfordTown_Gym/events.inc
index 237748602..237748602 100644
--- a/data/maps/events/DewfordTown_Gym.inc
+++ b/data/maps/DewfordTown_Gym/events.inc
diff --git a/data/maps/events/DewfordTown_Hall.inc b/data/maps/DewfordTown_Hall/events.inc
index 3eb9818fe..3eb9818fe 100644
--- a/data/maps/events/DewfordTown_Hall.inc
+++ b/data/maps/DewfordTown_Hall/events.inc
diff --git a/data/maps/events/DewfordTown_House1.inc b/data/maps/DewfordTown_House1/events.inc
index 69fd54d9c..69fd54d9c 100644
--- a/data/maps/events/DewfordTown_House1.inc
+++ b/data/maps/DewfordTown_House1/events.inc
diff --git a/data/maps/events/DewfordTown_House2.inc b/data/maps/DewfordTown_House2/events.inc
index f6858b846..f6858b846 100644
--- a/data/maps/events/DewfordTown_House2.inc
+++ b/data/maps/DewfordTown_House2/events.inc
diff --git a/data/maps/events/DewfordTown_PokemonCenter_1F.inc b/data/maps/DewfordTown_PokemonCenter_1F/events.inc
index 97b0e761a..97b0e761a 100644
--- a/data/maps/events/DewfordTown_PokemonCenter_1F.inc
+++ b/data/maps/DewfordTown_PokemonCenter_1F/events.inc
diff --git a/data/maps/events/DewfordTown_PokemonCenter_2F.inc b/data/maps/DewfordTown_PokemonCenter_2F/events.inc
index 333823536..333823536 100644
--- a/data/maps/events/DewfordTown_PokemonCenter_2F.inc
+++ b/data/maps/DewfordTown_PokemonCenter_2F/events.inc
diff --git a/data/maps/events/DoubleBattleColosseum.inc b/data/maps/DoubleBattleColosseum/events.inc
index a04c7a3a9..a04c7a3a9 100644
--- a/data/maps/events/DoubleBattleColosseum.inc
+++ b/data/maps/DoubleBattleColosseum/events.inc
diff --git a/data/maps/events/EverGrandeCity.inc b/data/maps/EverGrandeCity/events.inc
index 0a619b93d..0a619b93d 100644
--- a/data/maps/events/EverGrandeCity.inc
+++ b/data/maps/EverGrandeCity/events.inc
diff --git a/data/maps/events/EverGrandeCity_ChampionsRoom.inc b/data/maps/EverGrandeCity_ChampionsRoom/events.inc
index 832ddf206..832ddf206 100644
--- a/data/maps/events/EverGrandeCity_ChampionsRoom.inc
+++ b/data/maps/EverGrandeCity_ChampionsRoom/events.inc
diff --git a/data/maps/events/EverGrandeCity_Corridor1.inc b/data/maps/EverGrandeCity_Corridor1/events.inc
index f3ec6727e..f3ec6727e 100644
--- a/data/maps/events/EverGrandeCity_Corridor1.inc
+++ b/data/maps/EverGrandeCity_Corridor1/events.inc
diff --git a/data/maps/events/EverGrandeCity_Corridor2.inc b/data/maps/EverGrandeCity_Corridor2/events.inc
index e9a9cdc4c..e9a9cdc4c 100644
--- a/data/maps/events/EverGrandeCity_Corridor2.inc
+++ b/data/maps/EverGrandeCity_Corridor2/events.inc
diff --git a/data/maps/events/EverGrandeCity_Corridor3.inc b/data/maps/EverGrandeCity_Corridor3/events.inc
index 98d5f7b81..98d5f7b81 100644
--- a/data/maps/events/EverGrandeCity_Corridor3.inc
+++ b/data/maps/EverGrandeCity_Corridor3/events.inc
diff --git a/data/maps/events/EverGrandeCity_Corridor4.inc b/data/maps/EverGrandeCity_Corridor4/events.inc
index cbcf9f77e..cbcf9f77e 100644
--- a/data/maps/events/EverGrandeCity_Corridor4.inc
+++ b/data/maps/EverGrandeCity_Corridor4/events.inc
diff --git a/data/maps/events/EverGrandeCity_Corridor5.inc b/data/maps/EverGrandeCity_Corridor5/events.inc
index 5b77148ca..5b77148ca 100644
--- a/data/maps/events/EverGrandeCity_Corridor5.inc
+++ b/data/maps/EverGrandeCity_Corridor5/events.inc
diff --git a/data/maps/events/EverGrandeCity_DrakesRoom.inc b/data/maps/EverGrandeCity_DrakesRoom/events.inc
index 6b69d45da..6b69d45da 100644
--- a/data/maps/events/EverGrandeCity_DrakesRoom.inc
+++ b/data/maps/EverGrandeCity_DrakesRoom/events.inc
diff --git a/data/maps/events/EverGrandeCity_GlaciasRoom.inc b/data/maps/EverGrandeCity_GlaciasRoom/events.inc
index 8dba287fe..8dba287fe 100644
--- a/data/maps/events/EverGrandeCity_GlaciasRoom.inc
+++ b/data/maps/EverGrandeCity_GlaciasRoom/events.inc
diff --git a/data/maps/events/EverGrandeCity_HallOfFame.inc b/data/maps/EverGrandeCity_HallOfFame/events.inc
index f5a3f9137..f5a3f9137 100644
--- a/data/maps/events/EverGrandeCity_HallOfFame.inc
+++ b/data/maps/EverGrandeCity_HallOfFame/events.inc
diff --git a/data/maps/events/EverGrandeCity_PhoebesRoom.inc b/data/maps/EverGrandeCity_PhoebesRoom/events.inc
index aa67e5912..aa67e5912 100644
--- a/data/maps/events/EverGrandeCity_PhoebesRoom.inc
+++ b/data/maps/EverGrandeCity_PhoebesRoom/events.inc
diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc
index ea1045d22..ea1045d22 100644
--- a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc
diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc
index 36dfa01f7..36dfa01f7 100644
--- a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc
diff --git a/data/maps/events/EverGrandeCity_PokemonLeague.inc b/data/maps/EverGrandeCity_PokemonLeague/events.inc
index 89c6973a5..89c6973a5 100644
--- a/data/maps/events/EverGrandeCity_PokemonLeague.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague/events.inc
diff --git a/data/maps/events/EverGrandeCity_SidneysRoom.inc b/data/maps/EverGrandeCity_SidneysRoom/events.inc
index 552981282..552981282 100644
--- a/data/maps/events/EverGrandeCity_SidneysRoom.inc
+++ b/data/maps/EverGrandeCity_SidneysRoom/events.inc
diff --git a/data/maps/events/FallarborTown.inc b/data/maps/FallarborTown/events.inc
index 37308b07c..37308b07c 100644
--- a/data/maps/events/FallarborTown.inc
+++ b/data/maps/FallarborTown/events.inc
diff --git a/data/maps/events/FallarborTown_ContestHall.inc b/data/maps/FallarborTown_ContestHall/events.inc
index 9479c8db1..9479c8db1 100644
--- a/data/maps/events/FallarborTown_ContestHall.inc
+++ b/data/maps/FallarborTown_ContestHall/events.inc
diff --git a/data/maps/events/FallarborTown_ContestLobby.inc b/data/maps/FallarborTown_ContestLobby/events.inc
index 47144a554..47144a554 100644
--- a/data/maps/events/FallarborTown_ContestLobby.inc
+++ b/data/maps/FallarborTown_ContestLobby/events.inc
diff --git a/data/maps/events/FallarborTown_House1.inc b/data/maps/FallarborTown_House1/events.inc
index fefaadc51..fefaadc51 100644
--- a/data/maps/events/FallarborTown_House1.inc
+++ b/data/maps/FallarborTown_House1/events.inc
diff --git a/data/maps/events/FallarborTown_House2.inc b/data/maps/FallarborTown_House2/events.inc
index b873f95c8..b873f95c8 100644
--- a/data/maps/events/FallarborTown_House2.inc
+++ b/data/maps/FallarborTown_House2/events.inc
diff --git a/data/maps/events/FallarborTown_Mart.inc b/data/maps/FallarborTown_Mart/events.inc
index bf3195eea..bf3195eea 100644
--- a/data/maps/events/FallarborTown_Mart.inc
+++ b/data/maps/FallarborTown_Mart/events.inc
diff --git a/data/maps/events/FallarborTown_PokemonCenter_1F.inc b/data/maps/FallarborTown_PokemonCenter_1F/events.inc
index 06f8068c6..06f8068c6 100644
--- a/data/maps/events/FallarborTown_PokemonCenter_1F.inc
+++ b/data/maps/FallarborTown_PokemonCenter_1F/events.inc
diff --git a/data/maps/events/FallarborTown_PokemonCenter_2F.inc b/data/maps/FallarborTown_PokemonCenter_2F/events.inc
index 381051d01..381051d01 100644
--- a/data/maps/events/FallarborTown_PokemonCenter_2F.inc
+++ b/data/maps/FallarborTown_PokemonCenter_2F/events.inc
diff --git a/data/maps/events/FieryPath.inc b/data/maps/FieryPath/events.inc
index faf6d5011..faf6d5011 100644
--- a/data/maps/events/FieryPath.inc
+++ b/data/maps/FieryPath/events.inc
diff --git a/data/maps/events/FortreeCity.inc b/data/maps/FortreeCity/events.inc
index 485fd836f..485fd836f 100644
--- a/data/maps/events/FortreeCity.inc
+++ b/data/maps/FortreeCity/events.inc
diff --git a/data/maps/events/FortreeCity_DecorationShop.inc b/data/maps/FortreeCity_DecorationShop/events.inc
index 47e635fa8..47e635fa8 100644
--- a/data/maps/events/FortreeCity_DecorationShop.inc
+++ b/data/maps/FortreeCity_DecorationShop/events.inc
diff --git a/data/maps/events/FortreeCity_Gym.inc b/data/maps/FortreeCity_Gym/events.inc
index 9ff31951b..9ff31951b 100644
--- a/data/maps/events/FortreeCity_Gym.inc
+++ b/data/maps/FortreeCity_Gym/events.inc
diff --git a/data/maps/events/FortreeCity_House1.inc b/data/maps/FortreeCity_House1/events.inc
index 5e91f873e..5e91f873e 100644
--- a/data/maps/events/FortreeCity_House1.inc
+++ b/data/maps/FortreeCity_House1/events.inc
diff --git a/data/maps/events/FortreeCity_House2.inc b/data/maps/FortreeCity_House2/events.inc
index 41d8962fe..41d8962fe 100644
--- a/data/maps/events/FortreeCity_House2.inc
+++ b/data/maps/FortreeCity_House2/events.inc
diff --git a/data/maps/events/FortreeCity_House3.inc b/data/maps/FortreeCity_House3/events.inc
index e02749d0e..e02749d0e 100644
--- a/data/maps/events/FortreeCity_House3.inc
+++ b/data/maps/FortreeCity_House3/events.inc
diff --git a/data/maps/events/FortreeCity_House4.inc b/data/maps/FortreeCity_House4/events.inc
index 58285c7f4..58285c7f4 100644
--- a/data/maps/events/FortreeCity_House4.inc
+++ b/data/maps/FortreeCity_House4/events.inc
diff --git a/data/maps/events/FortreeCity_House5.inc b/data/maps/FortreeCity_House5/events.inc
index 93447f739..93447f739 100644
--- a/data/maps/events/FortreeCity_House5.inc
+++ b/data/maps/FortreeCity_House5/events.inc
diff --git a/data/maps/events/FortreeCity_Mart.inc b/data/maps/FortreeCity_Mart/events.inc
index a9c48da93..a9c48da93 100644
--- a/data/maps/events/FortreeCity_Mart.inc
+++ b/data/maps/FortreeCity_Mart/events.inc
diff --git a/data/maps/events/FortreeCity_PokemonCenter_1F.inc b/data/maps/FortreeCity_PokemonCenter_1F/events.inc
index dcf0e088a..dcf0e088a 100644
--- a/data/maps/events/FortreeCity_PokemonCenter_1F.inc
+++ b/data/maps/FortreeCity_PokemonCenter_1F/events.inc
diff --git a/data/maps/events/FortreeCity_PokemonCenter_2F.inc b/data/maps/FortreeCity_PokemonCenter_2F/events.inc
index 2e410c319..2e410c319 100644
--- a/data/maps/events/FortreeCity_PokemonCenter_2F.inc
+++ b/data/maps/FortreeCity_PokemonCenter_2F/events.inc
diff --git a/data/maps/events/GraniteCave_1F.inc b/data/maps/GraniteCave_1F/events.inc
index 20ea8d4d5..20ea8d4d5 100644
--- a/data/maps/events/GraniteCave_1F.inc
+++ b/data/maps/GraniteCave_1F/events.inc
diff --git a/data/maps/events/GraniteCave_B1F.inc b/data/maps/GraniteCave_B1F/events.inc
index 3d148a922..3d148a922 100644
--- a/data/maps/events/GraniteCave_B1F.inc
+++ b/data/maps/GraniteCave_B1F/events.inc
diff --git a/data/maps/events/GraniteCave_B2F.inc b/data/maps/GraniteCave_B2F/events.inc
index e5c7b1768..e5c7b1768 100644
--- a/data/maps/events/GraniteCave_B2F.inc
+++ b/data/maps/GraniteCave_B2F/events.inc
diff --git a/data/maps/events/GraniteCave_StevensRoom.inc b/data/maps/GraniteCave_StevensRoom/events.inc
index 9d8f4b2ba..9d8f4b2ba 100644
--- a/data/maps/events/GraniteCave_StevensRoom.inc
+++ b/data/maps/GraniteCave_StevensRoom/events.inc
diff --git a/data/maps/events/InsideOfTruck.inc b/data/maps/InsideOfTruck/events.inc
index 3aa3036de..3aa3036de 100644
--- a/data/maps/events/InsideOfTruck.inc
+++ b/data/maps/InsideOfTruck/events.inc
diff --git a/data/maps/events/IslandCave.inc b/data/maps/IslandCave/events.inc
index 8c279596d..8c279596d 100644
--- a/data/maps/events/IslandCave.inc
+++ b/data/maps/IslandCave/events.inc
diff --git a/data/maps/events/JaggedPass.inc b/data/maps/JaggedPass/events.inc
index 4b656e76e..4b656e76e 100644
--- a/data/maps/events/JaggedPass.inc
+++ b/data/maps/JaggedPass/events.inc
diff --git a/data/maps/events/LavaridgeTown.inc b/data/maps/LavaridgeTown/events.inc
index 895c792f4..895c792f4 100644
--- a/data/maps/events/LavaridgeTown.inc
+++ b/data/maps/LavaridgeTown/events.inc
diff --git a/data/maps/events/LavaridgeTown_Gym_1F.inc b/data/maps/LavaridgeTown_Gym_1F/events.inc
index ed3cc738f..ed3cc738f 100644
--- a/data/maps/events/LavaridgeTown_Gym_1F.inc
+++ b/data/maps/LavaridgeTown_Gym_1F/events.inc
diff --git a/data/maps/events/LavaridgeTown_Gym_B1F.inc b/data/maps/LavaridgeTown_Gym_B1F/events.inc
index 9492194a8..9492194a8 100644
--- a/data/maps/events/LavaridgeTown_Gym_B1F.inc
+++ b/data/maps/LavaridgeTown_Gym_B1F/events.inc
diff --git a/data/maps/events/LavaridgeTown_HerbShop.inc b/data/maps/LavaridgeTown_HerbShop/events.inc
index 0e2c546b6..0e2c546b6 100644
--- a/data/maps/events/LavaridgeTown_HerbShop.inc
+++ b/data/maps/LavaridgeTown_HerbShop/events.inc
diff --git a/data/maps/events/LavaridgeTown_House.inc b/data/maps/LavaridgeTown_House/events.inc
index 90e33480c..90e33480c 100644
--- a/data/maps/events/LavaridgeTown_House.inc
+++ b/data/maps/LavaridgeTown_House/events.inc
diff --git a/data/maps/events/LavaridgeTown_Mart.inc b/data/maps/LavaridgeTown_Mart/events.inc
index 2d365da54..2d365da54 100644
--- a/data/maps/events/LavaridgeTown_Mart.inc
+++ b/data/maps/LavaridgeTown_Mart/events.inc
diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc
index 98f670755..98f670755 100644
--- a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc
diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc
index 370feb889..370feb889 100644
--- a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc
diff --git a/data/maps/events/LilycoveCity.inc b/data/maps/LilycoveCity/events.inc
index e2aa43d2d..e2aa43d2d 100644
--- a/data/maps/events/LilycoveCity.inc
+++ b/data/maps/LilycoveCity/events.inc
diff --git a/data/maps/events/LilycoveCity_ContestHall.inc b/data/maps/LilycoveCity_ContestHall/events.inc
index bc4331484..bc4331484 100644
--- a/data/maps/events/LilycoveCity_ContestHall.inc
+++ b/data/maps/LilycoveCity_ContestHall/events.inc
diff --git a/data/maps/events/LilycoveCity_ContestLobby.inc b/data/maps/LilycoveCity_ContestLobby/events.inc
index b44590d65..b44590d65 100644
--- a/data/maps/events/LilycoveCity_ContestLobby.inc
+++ b/data/maps/LilycoveCity_ContestLobby/events.inc
diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc
index eee09c890..eee09c890 100644
--- a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc
diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc
index 4469cddb0..4469cddb0 100644
--- a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc
diff --git a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc
index eca98b599..eca98b599 100644
--- a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc
diff --git a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc
index 71d34fa68..71d34fa68 100644
--- a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc
index d5170d4c1..d5170d4c1 100644
--- a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc
index 65c22a60f..65c22a60f 100644
--- a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc
index 212d44971..212d44971 100644
--- a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc
index 40b8eab37..40b8eab37 100644
--- a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc
index 2883d167b..2883d167b 100644
--- a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc
diff --git a/data/maps/events/LilycoveCity_EmptyMap.inc b/data/maps/LilycoveCity_EmptyMap/events.inc
index 4ac5c42b8..4ac5c42b8 100644
--- a/data/maps/events/LilycoveCity_EmptyMap.inc
+++ b/data/maps/LilycoveCity_EmptyMap/events.inc
diff --git a/data/maps/events/LilycoveCity_Harbor.inc b/data/maps/LilycoveCity_Harbor/events.inc
index 35a34928f..35a34928f 100644
--- a/data/maps/events/LilycoveCity_Harbor.inc
+++ b/data/maps/LilycoveCity_Harbor/events.inc
diff --git a/data/maps/events/LilycoveCity_House1.inc b/data/maps/LilycoveCity_House1/events.inc
index 482ebf0b6..482ebf0b6 100644
--- a/data/maps/events/LilycoveCity_House1.inc
+++ b/data/maps/LilycoveCity_House1/events.inc
diff --git a/data/maps/events/LilycoveCity_House2.inc b/data/maps/LilycoveCity_House2/events.inc
index d557cd75a..d557cd75a 100644
--- a/data/maps/events/LilycoveCity_House2.inc
+++ b/data/maps/LilycoveCity_House2/events.inc
diff --git a/data/maps/events/LilycoveCity_House3.inc b/data/maps/LilycoveCity_House3/events.inc
index 2186eb0d2..2186eb0d2 100644
--- a/data/maps/events/LilycoveCity_House3.inc
+++ b/data/maps/LilycoveCity_House3/events.inc
diff --git a/data/maps/events/LilycoveCity_House4.inc b/data/maps/LilycoveCity_House4/events.inc
index d5ebda9f2..d5ebda9f2 100644
--- a/data/maps/events/LilycoveCity_House4.inc
+++ b/data/maps/LilycoveCity_House4/events.inc
diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc
index a081a6523..a081a6523 100644
--- a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc
diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc
index 4e2ffe49f..4e2ffe49f 100644
--- a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc
diff --git a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc
index d28c4631c..d28c4631c 100644
--- a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc
+++ b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc
diff --git a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc
index 2505adbc3..2505adbc3 100644
--- a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc
diff --git a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc
index b8fd09d02..b8fd09d02 100644
--- a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc
diff --git a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc
index 4f1d4ff4d..4f1d4ff4d 100644
--- a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc
diff --git a/data/maps/events/LilycoveCity_UnusedMart.inc b/data/maps/LilycoveCity_UnusedMart/events.inc
index 4a0127506..4a0127506 100644
--- a/data/maps/events/LilycoveCity_UnusedMart.inc
+++ b/data/maps/LilycoveCity_UnusedMart/events.inc
diff --git a/data/maps/events/LinkContestRoom1.inc b/data/maps/LinkContestRoom1/events.inc
index 9bcf27a90..9bcf27a90 100644
--- a/data/maps/events/LinkContestRoom1.inc
+++ b/data/maps/LinkContestRoom1/events.inc
diff --git a/data/maps/events/LinkContestRoom2.inc b/data/maps/LinkContestRoom2/events.inc
index 562a96523..562a96523 100644
--- a/data/maps/events/LinkContestRoom2.inc
+++ b/data/maps/LinkContestRoom2/events.inc
diff --git a/data/maps/events/LinkContestRoom3.inc b/data/maps/LinkContestRoom3/events.inc
index 8c93f28c9..8c93f28c9 100644
--- a/data/maps/events/LinkContestRoom3.inc
+++ b/data/maps/LinkContestRoom3/events.inc
diff --git a/data/maps/events/LinkContestRoom4.inc b/data/maps/LinkContestRoom4/events.inc
index a5e455811..a5e455811 100644
--- a/data/maps/events/LinkContestRoom4.inc
+++ b/data/maps/LinkContestRoom4/events.inc
diff --git a/data/maps/events/LinkContestRoom5.inc b/data/maps/LinkContestRoom5/events.inc
index f0f8fa508..f0f8fa508 100644
--- a/data/maps/events/LinkContestRoom5.inc
+++ b/data/maps/LinkContestRoom5/events.inc
diff --git a/data/maps/events/LinkContestRoom6.inc b/data/maps/LinkContestRoom6/events.inc
index a8fd4962f..a8fd4962f 100644
--- a/data/maps/events/LinkContestRoom6.inc
+++ b/data/maps/LinkContestRoom6/events.inc
diff --git a/data/maps/events/LittlerootTown.inc b/data/maps/LittlerootTown/events.inc
index b50dbc7e1..b50dbc7e1 100644
--- a/data/maps/events/LittlerootTown.inc
+++ b/data/maps/LittlerootTown/events.inc
diff --git a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc
index 4ac7d4b3c..4ac7d4b3c 100644
--- a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc
diff --git a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc
index 2e4c4b6ae..2e4c4b6ae 100644
--- a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc
diff --git a/data/maps/events/LittlerootTown_MaysHouse_1F.inc b/data/maps/LittlerootTown_MaysHouse_1F/events.inc
index 353dc00a8..353dc00a8 100644
--- a/data/maps/events/LittlerootTown_MaysHouse_1F.inc
+++ b/data/maps/LittlerootTown_MaysHouse_1F/events.inc
diff --git a/data/maps/events/LittlerootTown_MaysHouse_2F.inc b/data/maps/LittlerootTown_MaysHouse_2F/events.inc
index 98a144305..98a144305 100644
--- a/data/maps/events/LittlerootTown_MaysHouse_2F.inc
+++ b/data/maps/LittlerootTown_MaysHouse_2F/events.inc
diff --git a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc
index bca8009b5..bca8009b5 100644
--- a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc
diff --git a/data/maps/events/MagmaHideout_1F.inc b/data/maps/MagmaHideout_1F/events.inc
index 362d9b719..362d9b719 100644
--- a/data/maps/events/MagmaHideout_1F.inc
+++ b/data/maps/MagmaHideout_1F/events.inc
diff --git a/data/maps/events/MagmaHideout_B1F.inc b/data/maps/MagmaHideout_B1F/events.inc
index 5e4c3a078..5e4c3a078 100644
--- a/data/maps/events/MagmaHideout_B1F.inc
+++ b/data/maps/MagmaHideout_B1F/events.inc
diff --git a/data/maps/events/MagmaHideout_B2F.inc b/data/maps/MagmaHideout_B2F/events.inc
index 111b97e42..111b97e42 100644
--- a/data/maps/events/MagmaHideout_B2F.inc
+++ b/data/maps/MagmaHideout_B2F/events.inc
diff --git a/data/maps/events/MauvilleCity.inc b/data/maps/MauvilleCity/events.inc
index 6b26c7973..6b26c7973 100644
--- a/data/maps/events/MauvilleCity.inc
+++ b/data/maps/MauvilleCity/events.inc
diff --git a/data/maps/events/MauvilleCity_BikeShop.inc b/data/maps/MauvilleCity_BikeShop/events.inc
index 83b5f66d8..83b5f66d8 100644
--- a/data/maps/events/MauvilleCity_BikeShop.inc
+++ b/data/maps/MauvilleCity_BikeShop/events.inc
diff --git a/data/maps/events/MauvilleCity_GameCorner.inc b/data/maps/MauvilleCity_GameCorner/events.inc
index 7b789a34e..7b789a34e 100644
--- a/data/maps/events/MauvilleCity_GameCorner.inc
+++ b/data/maps/MauvilleCity_GameCorner/events.inc
diff --git a/data/maps/events/MauvilleCity_Gym.inc b/data/maps/MauvilleCity_Gym/events.inc
index cfcbbc4c6..cfcbbc4c6 100644
--- a/data/maps/events/MauvilleCity_Gym.inc
+++ b/data/maps/MauvilleCity_Gym/events.inc
diff --git a/data/maps/events/MauvilleCity_House1.inc b/data/maps/MauvilleCity_House1/events.inc
index 07044121d..07044121d 100644
--- a/data/maps/events/MauvilleCity_House1.inc
+++ b/data/maps/MauvilleCity_House1/events.inc
diff --git a/data/maps/events/MauvilleCity_House2.inc b/data/maps/MauvilleCity_House2/events.inc
index 58d8d5a24..58d8d5a24 100644
--- a/data/maps/events/MauvilleCity_House2.inc
+++ b/data/maps/MauvilleCity_House2/events.inc
diff --git a/data/maps/events/MauvilleCity_Mart.inc b/data/maps/MauvilleCity_Mart/events.inc
index cb8397726..cb8397726 100644
--- a/data/maps/events/MauvilleCity_Mart.inc
+++ b/data/maps/MauvilleCity_Mart/events.inc
diff --git a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc
index 30f702a6f..30f702a6f 100644
--- a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc
diff --git a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc
index aef1d63ed..aef1d63ed 100644
--- a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc
diff --git a/data/maps/events/MeteorFalls_1F_1R.inc b/data/maps/MeteorFalls_1F_1R/events.inc
index 0b85c4e98..0b85c4e98 100644
--- a/data/maps/events/MeteorFalls_1F_1R.inc
+++ b/data/maps/MeteorFalls_1F_1R/events.inc
diff --git a/data/maps/events/MeteorFalls_1F_2R.inc b/data/maps/MeteorFalls_1F_2R/events.inc
index 5264fcb5e..5264fcb5e 100644
--- a/data/maps/events/MeteorFalls_1F_2R.inc
+++ b/data/maps/MeteorFalls_1F_2R/events.inc
diff --git a/data/maps/events/MeteorFalls_B1F_1R.inc b/data/maps/MeteorFalls_B1F_1R/events.inc
index 053c932ce..053c932ce 100644
--- a/data/maps/events/MeteorFalls_B1F_1R.inc
+++ b/data/maps/MeteorFalls_B1F_1R/events.inc
diff --git a/data/maps/events/MeteorFalls_B1F_2R.inc b/data/maps/MeteorFalls_B1F_2R/events.inc
index 964a6c447..964a6c447 100644
--- a/data/maps/events/MeteorFalls_B1F_2R.inc
+++ b/data/maps/MeteorFalls_B1F_2R/events.inc
diff --git a/data/maps/events/MossdeepCity.inc b/data/maps/MossdeepCity/events.inc
index 4803f9347..4803f9347 100644
--- a/data/maps/events/MossdeepCity.inc
+++ b/data/maps/MossdeepCity/events.inc
diff --git a/data/maps/events/MossdeepCity_GameCorner_1F.inc b/data/maps/MossdeepCity_GameCorner_1F/events.inc
index 2d10740b1..2d10740b1 100644
--- a/data/maps/events/MossdeepCity_GameCorner_1F.inc
+++ b/data/maps/MossdeepCity_GameCorner_1F/events.inc
diff --git a/data/maps/events/MossdeepCity_GameCorner_B1F.inc b/data/maps/MossdeepCity_GameCorner_B1F/events.inc
index da6316421..da6316421 100644
--- a/data/maps/events/MossdeepCity_GameCorner_B1F.inc
+++ b/data/maps/MossdeepCity_GameCorner_B1F/events.inc
diff --git a/data/maps/events/MossdeepCity_Gym.inc b/data/maps/MossdeepCity_Gym/events.inc
index 7c7a25777..7c7a25777 100644
--- a/data/maps/events/MossdeepCity_Gym.inc
+++ b/data/maps/MossdeepCity_Gym/events.inc
diff --git a/data/maps/events/MossdeepCity_House1.inc b/data/maps/MossdeepCity_House1/events.inc
index 2fe9e0373..2fe9e0373 100644
--- a/data/maps/events/MossdeepCity_House1.inc
+++ b/data/maps/MossdeepCity_House1/events.inc
diff --git a/data/maps/events/MossdeepCity_House2.inc b/data/maps/MossdeepCity_House2/events.inc
index 743350683..743350683 100644
--- a/data/maps/events/MossdeepCity_House2.inc
+++ b/data/maps/MossdeepCity_House2/events.inc
diff --git a/data/maps/events/MossdeepCity_House3.inc b/data/maps/MossdeepCity_House3/events.inc
index f601038e6..f601038e6 100644
--- a/data/maps/events/MossdeepCity_House3.inc
+++ b/data/maps/MossdeepCity_House3/events.inc
diff --git a/data/maps/events/MossdeepCity_House4.inc b/data/maps/MossdeepCity_House4/events.inc
index cfde3a35e..cfde3a35e 100644
--- a/data/maps/events/MossdeepCity_House4.inc
+++ b/data/maps/MossdeepCity_House4/events.inc
diff --git a/data/maps/events/MossdeepCity_Mart.inc b/data/maps/MossdeepCity_Mart/events.inc
index 92f4a8cbd..92f4a8cbd 100644
--- a/data/maps/events/MossdeepCity_Mart.inc
+++ b/data/maps/MossdeepCity_Mart/events.inc
diff --git a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc
index da310c9f7..da310c9f7 100644
--- a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc
diff --git a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc
index 4af09479f..4af09479f 100644
--- a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc
diff --git a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc
index 85e716a93..85e716a93 100644
--- a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc
diff --git a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc
index faf5d89fa..faf5d89fa 100644
--- a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc
diff --git a/data/maps/events/MossdeepCity_StevensHouse.inc b/data/maps/MossdeepCity_StevensHouse/events.inc
index 7a8fee393..7a8fee393 100644
--- a/data/maps/events/MossdeepCity_StevensHouse.inc
+++ b/data/maps/MossdeepCity_StevensHouse/events.inc
diff --git a/data/maps/events/MtChimney.inc b/data/maps/MtChimney/events.inc
index f011502f2..f011502f2 100644
--- a/data/maps/events/MtChimney.inc
+++ b/data/maps/MtChimney/events.inc
diff --git a/data/maps/events/MtChimney_CableCarStation.inc b/data/maps/MtChimney_CableCarStation/events.inc
index e5d69ee75..e5d69ee75 100644
--- a/data/maps/events/MtChimney_CableCarStation.inc
+++ b/data/maps/MtChimney_CableCarStation/events.inc
diff --git a/data/maps/events/MtPyre_1F.inc b/data/maps/MtPyre_1F/events.inc
index f547a9a98..f547a9a98 100644
--- a/data/maps/events/MtPyre_1F.inc
+++ b/data/maps/MtPyre_1F/events.inc
diff --git a/data/maps/events/MtPyre_2F.inc b/data/maps/MtPyre_2F/events.inc
index 9f8041366..9f8041366 100644
--- a/data/maps/events/MtPyre_2F.inc
+++ b/data/maps/MtPyre_2F/events.inc
diff --git a/data/maps/events/MtPyre_3F.inc b/data/maps/MtPyre_3F/events.inc
index fbaf6fa4b..fbaf6fa4b 100644
--- a/data/maps/events/MtPyre_3F.inc
+++ b/data/maps/MtPyre_3F/events.inc
diff --git a/data/maps/events/MtPyre_4F.inc b/data/maps/MtPyre_4F/events.inc
index 9de527f2d..9de527f2d 100644
--- a/data/maps/events/MtPyre_4F.inc
+++ b/data/maps/MtPyre_4F/events.inc
diff --git a/data/maps/events/MtPyre_5F.inc b/data/maps/MtPyre_5F/events.inc
index cbf1b64b4..cbf1b64b4 100644
--- a/data/maps/events/MtPyre_5F.inc
+++ b/data/maps/MtPyre_5F/events.inc
diff --git a/data/maps/events/MtPyre_6F.inc b/data/maps/MtPyre_6F/events.inc
index d65a3a8c6..d65a3a8c6 100644
--- a/data/maps/events/MtPyre_6F.inc
+++ b/data/maps/MtPyre_6F/events.inc
diff --git a/data/maps/events/MtPyre_Exterior.inc b/data/maps/MtPyre_Exterior/events.inc
index 48593481e..48593481e 100644
--- a/data/maps/events/MtPyre_Exterior.inc
+++ b/data/maps/MtPyre_Exterior/events.inc
diff --git a/data/maps/events/MtPyre_Summit.inc b/data/maps/MtPyre_Summit/events.inc
index 3ddc6f36b..3ddc6f36b 100644
--- a/data/maps/events/MtPyre_Summit.inc
+++ b/data/maps/MtPyre_Summit/events.inc
diff --git a/data/maps/events/NewMauville_Entrance.inc b/data/maps/NewMauville_Entrance/events.inc
index 8967a1df0..8967a1df0 100644
--- a/data/maps/events/NewMauville_Entrance.inc
+++ b/data/maps/NewMauville_Entrance/events.inc
diff --git a/data/maps/events/NewMauville_Inside.inc b/data/maps/NewMauville_Inside/events.inc
index be85150e3..be85150e3 100644
--- a/data/maps/events/NewMauville_Inside.inc
+++ b/data/maps/NewMauville_Inside/events.inc
diff --git a/data/maps/events/OldaleTown.inc b/data/maps/OldaleTown/events.inc
index ac50e1197..ac50e1197 100644
--- a/data/maps/events/OldaleTown.inc
+++ b/data/maps/OldaleTown/events.inc
diff --git a/data/maps/events/OldaleTown_House1.inc b/data/maps/OldaleTown_House1/events.inc
index e037e3b0e..e037e3b0e 100644
--- a/data/maps/events/OldaleTown_House1.inc
+++ b/data/maps/OldaleTown_House1/events.inc
diff --git a/data/maps/events/OldaleTown_House2.inc b/data/maps/OldaleTown_House2/events.inc
index 0968fda57..0968fda57 100644
--- a/data/maps/events/OldaleTown_House2.inc
+++ b/data/maps/OldaleTown_House2/events.inc
diff --git a/data/maps/events/OldaleTown_Mart.inc b/data/maps/OldaleTown_Mart/events.inc
index 9d0b70937..9d0b70937 100644
--- a/data/maps/events/OldaleTown_Mart.inc
+++ b/data/maps/OldaleTown_Mart/events.inc
diff --git a/data/maps/events/OldaleTown_PokemonCenter_1F.inc b/data/maps/OldaleTown_PokemonCenter_1F/events.inc
index 89ad23d8f..89ad23d8f 100644
--- a/data/maps/events/OldaleTown_PokemonCenter_1F.inc
+++ b/data/maps/OldaleTown_PokemonCenter_1F/events.inc
diff --git a/data/maps/events/OldaleTown_PokemonCenter_2F.inc b/data/maps/OldaleTown_PokemonCenter_2F/events.inc
index 9af6ec676..9af6ec676 100644
--- a/data/maps/events/OldaleTown_PokemonCenter_2F.inc
+++ b/data/maps/OldaleTown_PokemonCenter_2F/events.inc
diff --git a/data/maps/events/PacifidlogTown.inc b/data/maps/PacifidlogTown/events.inc
index f8db75501..f8db75501 100644
--- a/data/maps/events/PacifidlogTown.inc
+++ b/data/maps/PacifidlogTown/events.inc
diff --git a/data/maps/events/PacifidlogTown_House1.inc b/data/maps/PacifidlogTown_House1/events.inc
index 95d0009d9..95d0009d9 100644
--- a/data/maps/events/PacifidlogTown_House1.inc
+++ b/data/maps/PacifidlogTown_House1/events.inc
diff --git a/data/maps/events/PacifidlogTown_House2.inc b/data/maps/PacifidlogTown_House2/events.inc
index 00493650a..00493650a 100644
--- a/data/maps/events/PacifidlogTown_House2.inc
+++ b/data/maps/PacifidlogTown_House2/events.inc
diff --git a/data/maps/events/PacifidlogTown_House3.inc b/data/maps/PacifidlogTown_House3/events.inc
index 0f7bb798b..0f7bb798b 100644
--- a/data/maps/events/PacifidlogTown_House3.inc
+++ b/data/maps/PacifidlogTown_House3/events.inc
diff --git a/data/maps/events/PacifidlogTown_House4.inc b/data/maps/PacifidlogTown_House4/events.inc
index e41a86e44..e41a86e44 100644
--- a/data/maps/events/PacifidlogTown_House4.inc
+++ b/data/maps/PacifidlogTown_House4/events.inc
diff --git a/data/maps/events/PacifidlogTown_House5.inc b/data/maps/PacifidlogTown_House5/events.inc
index bac0ca3e1..bac0ca3e1 100644
--- a/data/maps/events/PacifidlogTown_House5.inc
+++ b/data/maps/PacifidlogTown_House5/events.inc
diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc
index 05f1e9698..05f1e9698 100644
--- a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc
diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc
index 8bc70f400..8bc70f400 100644
--- a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc
diff --git a/data/maps/events/PetalburgCity.inc b/data/maps/PetalburgCity/events.inc
index 43216cdc9..43216cdc9 100644
--- a/data/maps/events/PetalburgCity.inc
+++ b/data/maps/PetalburgCity/events.inc
diff --git a/data/maps/events/PetalburgCity_Gym.inc b/data/maps/PetalburgCity_Gym/events.inc
index b5dd1f57b..b5dd1f57b 100644
--- a/data/maps/events/PetalburgCity_Gym.inc
+++ b/data/maps/PetalburgCity_Gym/events.inc
diff --git a/data/maps/events/PetalburgCity_House1.inc b/data/maps/PetalburgCity_House1/events.inc
index df1970bd4..df1970bd4 100644
--- a/data/maps/events/PetalburgCity_House1.inc
+++ b/data/maps/PetalburgCity_House1/events.inc
diff --git a/data/maps/events/PetalburgCity_House2.inc b/data/maps/PetalburgCity_House2/events.inc
index b26cc139f..b26cc139f 100644
--- a/data/maps/events/PetalburgCity_House2.inc
+++ b/data/maps/PetalburgCity_House2/events.inc
diff --git a/data/maps/events/PetalburgCity_Mart.inc b/data/maps/PetalburgCity_Mart/events.inc
index 3171dca99..3171dca99 100644
--- a/data/maps/events/PetalburgCity_Mart.inc
+++ b/data/maps/PetalburgCity_Mart/events.inc
diff --git a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc
index d4dc0c63e..d4dc0c63e 100644
--- a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc
diff --git a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc
index 365e3a258..365e3a258 100644
--- a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc
diff --git a/data/maps/events/PetalburgCity_WallysHouse.inc b/data/maps/PetalburgCity_WallysHouse/events.inc
index bc33ab969..bc33ab969 100644
--- a/data/maps/events/PetalburgCity_WallysHouse.inc
+++ b/data/maps/PetalburgCity_WallysHouse/events.inc
diff --git a/data/maps/events/PetalburgWoods.inc b/data/maps/PetalburgWoods/events.inc
index d624d94dc..d624d94dc 100644
--- a/data/maps/events/PetalburgWoods.inc
+++ b/data/maps/PetalburgWoods/events.inc
diff --git a/data/maps/events/RecordCorner.inc b/data/maps/RecordCorner/events.inc
index e8c27a9c9..e8c27a9c9 100644
--- a/data/maps/events/RecordCorner.inc
+++ b/data/maps/RecordCorner/events.inc
diff --git a/data/maps/events/Route101.inc b/data/maps/Route101/events.inc
index 933509835..933509835 100644
--- a/data/maps/events/Route101.inc
+++ b/data/maps/Route101/events.inc
diff --git a/data/maps/events/Route102.inc b/data/maps/Route102/events.inc
index 4de0e95d2..4de0e95d2 100644
--- a/data/maps/events/Route102.inc
+++ b/data/maps/Route102/events.inc
diff --git a/data/maps/events/Route103.inc b/data/maps/Route103/events.inc
index f131106da..f131106da 100644
--- a/data/maps/events/Route103.inc
+++ b/data/maps/Route103/events.inc
diff --git a/data/maps/events/Route104.inc b/data/maps/Route104/events.inc
index 61934c590..61934c590 100644
--- a/data/maps/events/Route104.inc
+++ b/data/maps/Route104/events.inc
diff --git a/data/maps/events/Route104_MrBrineysHouse.inc b/data/maps/Route104_MrBrineysHouse/events.inc
index 9ae66cabb..9ae66cabb 100644
--- a/data/maps/events/Route104_MrBrineysHouse.inc
+++ b/data/maps/Route104_MrBrineysHouse/events.inc
diff --git a/data/maps/events/Route104_PrettyPetalFlowerShop.inc b/data/maps/Route104_PrettyPetalFlowerShop/events.inc
index edf18089d..edf18089d 100644
--- a/data/maps/events/Route104_PrettyPetalFlowerShop.inc
+++ b/data/maps/Route104_PrettyPetalFlowerShop/events.inc
diff --git a/data/maps/events/Route104_Prototype.inc b/data/maps/Route104_Prototype/events.inc
index 2d7c90dc1..2d7c90dc1 100644
--- a/data/maps/events/Route104_Prototype.inc
+++ b/data/maps/Route104_Prototype/events.inc
diff --git a/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc
index 89ceb8270..89ceb8270 100644
--- a/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc
+++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc
diff --git a/data/maps/events/Route105.inc b/data/maps/Route105/events.inc
index 999966093..999966093 100644
--- a/data/maps/events/Route105.inc
+++ b/data/maps/Route105/events.inc
diff --git a/data/maps/events/Route106.inc b/data/maps/Route106/events.inc
index 55f395ded..55f395ded 100644
--- a/data/maps/events/Route106.inc
+++ b/data/maps/Route106/events.inc
diff --git a/data/maps/events/Route107.inc b/data/maps/Route107/events.inc
index 9bdeaf3b0..9bdeaf3b0 100644
--- a/data/maps/events/Route107.inc
+++ b/data/maps/Route107/events.inc
diff --git a/data/maps/events/Route108.inc b/data/maps/Route108/events.inc
index 997fb5ce2..997fb5ce2 100644
--- a/data/maps/events/Route108.inc
+++ b/data/maps/Route108/events.inc
diff --git a/data/maps/events/Route109.inc b/data/maps/Route109/events.inc
index 7376fd4bf..7376fd4bf 100644
--- a/data/maps/events/Route109.inc
+++ b/data/maps/Route109/events.inc
diff --git a/data/maps/events/Route109_SeashoreHouse.inc b/data/maps/Route109_SeashoreHouse/events.inc
index f82513f08..f82513f08 100644
--- a/data/maps/events/Route109_SeashoreHouse.inc
+++ b/data/maps/Route109_SeashoreHouse/events.inc
diff --git a/data/maps/events/Route110.inc b/data/maps/Route110/events.inc
index eb032e0cc..eb032e0cc 100644
--- a/data/maps/events/Route110.inc
+++ b/data/maps/Route110/events.inc
diff --git a/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc
index 0474772cb..0474772cb 100644
--- a/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc
+++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc
diff --git a/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc
index 996562b61..996562b61 100644
--- a/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc
+++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc
diff --git a/data/maps/events/Route110_TrickHouseCorridor.inc b/data/maps/Route110_TrickHouseCorridor/events.inc
index 4b7e39efd..4b7e39efd 100644
--- a/data/maps/events/Route110_TrickHouseCorridor.inc
+++ b/data/maps/Route110_TrickHouseCorridor/events.inc
diff --git a/data/maps/events/Route110_TrickHouseEnd.inc b/data/maps/Route110_TrickHouseEnd/events.inc
index 732c6c705..732c6c705 100644
--- a/data/maps/events/Route110_TrickHouseEnd.inc
+++ b/data/maps/Route110_TrickHouseEnd/events.inc
diff --git a/data/maps/events/Route110_TrickHouseEntrance.inc b/data/maps/Route110_TrickHouseEntrance/events.inc
index 07c5a6555..07c5a6555 100644
--- a/data/maps/events/Route110_TrickHouseEntrance.inc
+++ b/data/maps/Route110_TrickHouseEntrance/events.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle1.inc b/data/maps/Route110_TrickHousePuzzle1/events.inc
index ef5b7732f..ef5b7732f 100644
--- a/data/maps/events/Route110_TrickHousePuzzle1.inc
+++ b/data/maps/Route110_TrickHousePuzzle1/events.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle2.inc b/data/maps/Route110_TrickHousePuzzle2/events.inc
index c815a1624..c815a1624 100644
--- a/data/maps/events/Route110_TrickHousePuzzle2.inc
+++ b/data/maps/Route110_TrickHousePuzzle2/events.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle3.inc b/data/maps/Route110_TrickHousePuzzle3/events.inc
index e45f2d33b..e45f2d33b 100644
--- a/data/maps/events/Route110_TrickHousePuzzle3.inc
+++ b/data/maps/Route110_TrickHousePuzzle3/events.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle4.inc b/data/maps/Route110_TrickHousePuzzle4/events.inc
index 4d7189920..4d7189920 100644
--- a/data/maps/events/Route110_TrickHousePuzzle4.inc
+++ b/data/maps/Route110_TrickHousePuzzle4/events.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle5.inc b/data/maps/Route110_TrickHousePuzzle5/events.inc
index 66884fc3d..66884fc3d 100644
--- a/data/maps/events/Route110_TrickHousePuzzle5.inc
+++ b/data/maps/Route110_TrickHousePuzzle5/events.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle6.inc b/data/maps/Route110_TrickHousePuzzle6/events.inc
index 6ac299c5f..6ac299c5f 100644
--- a/data/maps/events/Route110_TrickHousePuzzle6.inc
+++ b/data/maps/Route110_TrickHousePuzzle6/events.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle7.inc b/data/maps/Route110_TrickHousePuzzle7/events.inc
index d57546ce1..d57546ce1 100644
--- a/data/maps/events/Route110_TrickHousePuzzle7.inc
+++ b/data/maps/Route110_TrickHousePuzzle7/events.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle8.inc b/data/maps/Route110_TrickHousePuzzle8/events.inc
index 481b2d926..481b2d926 100644
--- a/data/maps/events/Route110_TrickHousePuzzle8.inc
+++ b/data/maps/Route110_TrickHousePuzzle8/events.inc
diff --git a/data/maps/events/Route111.inc b/data/maps/Route111/events.inc
index 837c17c39..837c17c39 100644
--- a/data/maps/events/Route111.inc
+++ b/data/maps/Route111/events.inc
diff --git a/data/maps/events/Route111_OldLadysRestStop.inc b/data/maps/Route111_OldLadysRestStop/events.inc
index da7f2f605..da7f2f605 100644
--- a/data/maps/events/Route111_OldLadysRestStop.inc
+++ b/data/maps/Route111_OldLadysRestStop/events.inc
diff --git a/data/maps/events/Route111_WinstrateFamilysHouse.inc b/data/maps/Route111_WinstrateFamilysHouse/events.inc
index 70d00eabc..70d00eabc 100644
--- a/data/maps/events/Route111_WinstrateFamilysHouse.inc
+++ b/data/maps/Route111_WinstrateFamilysHouse/events.inc
diff --git a/data/maps/events/Route112.inc b/data/maps/Route112/events.inc
index e1673dc69..e1673dc69 100644
--- a/data/maps/events/Route112.inc
+++ b/data/maps/Route112/events.inc
diff --git a/data/maps/events/Route112_CableCarStation.inc b/data/maps/Route112_CableCarStation/events.inc
index a2c93ca9d..a2c93ca9d 100644
--- a/data/maps/events/Route112_CableCarStation.inc
+++ b/data/maps/Route112_CableCarStation/events.inc
diff --git a/data/maps/events/Route113.inc b/data/maps/Route113/events.inc
index 3fd5ea281..3fd5ea281 100644
--- a/data/maps/events/Route113.inc
+++ b/data/maps/Route113/events.inc
diff --git a/data/maps/events/Route113_GlassWorkshop.inc b/data/maps/Route113_GlassWorkshop/events.inc
index 24b90b2d7..24b90b2d7 100644
--- a/data/maps/events/Route113_GlassWorkshop.inc
+++ b/data/maps/Route113_GlassWorkshop/events.inc
diff --git a/data/maps/events/Route114.inc b/data/maps/Route114/events.inc
index eb05dd1ce..eb05dd1ce 100644
--- a/data/maps/events/Route114.inc
+++ b/data/maps/Route114/events.inc
diff --git a/data/maps/events/Route114_FossilManiacsHouse.inc b/data/maps/Route114_FossilManiacsHouse/events.inc
index 1f41db668..1f41db668 100644
--- a/data/maps/events/Route114_FossilManiacsHouse.inc
+++ b/data/maps/Route114_FossilManiacsHouse/events.inc
diff --git a/data/maps/events/Route114_FossilManiacsTunnel.inc b/data/maps/Route114_FossilManiacsTunnel/events.inc
index 13db6a8ca..13db6a8ca 100644
--- a/data/maps/events/Route114_FossilManiacsTunnel.inc
+++ b/data/maps/Route114_FossilManiacsTunnel/events.inc
diff --git a/data/maps/events/Route114_LanettesHouse.inc b/data/maps/Route114_LanettesHouse/events.inc
index 86ebf06de..86ebf06de 100644
--- a/data/maps/events/Route114_LanettesHouse.inc
+++ b/data/maps/Route114_LanettesHouse/events.inc
diff --git a/data/maps/events/Route115.inc b/data/maps/Route115/events.inc
index e03d62fb4..e03d62fb4 100644
--- a/data/maps/events/Route115.inc
+++ b/data/maps/Route115/events.inc
diff --git a/data/maps/events/Route116.inc b/data/maps/Route116/events.inc
index fd1b98f0a..fd1b98f0a 100644
--- a/data/maps/events/Route116.inc
+++ b/data/maps/Route116/events.inc
diff --git a/data/maps/events/Route116_TunnelersRestHouse.inc b/data/maps/Route116_TunnelersRestHouse/events.inc
index 454f184e3..454f184e3 100644
--- a/data/maps/events/Route116_TunnelersRestHouse.inc
+++ b/data/maps/Route116_TunnelersRestHouse/events.inc
diff --git a/data/maps/events/Route117.inc b/data/maps/Route117/events.inc
index a668f4b32..a668f4b32 100644
--- a/data/maps/events/Route117.inc
+++ b/data/maps/Route117/events.inc
diff --git a/data/maps/events/Route117_PokemonDayCare.inc b/data/maps/Route117_PokemonDayCare/events.inc
index 3f2c3be51..3f2c3be51 100644
--- a/data/maps/events/Route117_PokemonDayCare.inc
+++ b/data/maps/Route117_PokemonDayCare/events.inc
diff --git a/data/maps/events/Route118.inc b/data/maps/Route118/events.inc
index c12e77bd9..c12e77bd9 100644
--- a/data/maps/events/Route118.inc
+++ b/data/maps/Route118/events.inc
diff --git a/data/maps/events/Route119.inc b/data/maps/Route119/events.inc
index 49677e8e5..49677e8e5 100644
--- a/data/maps/events/Route119.inc
+++ b/data/maps/Route119/events.inc
diff --git a/data/maps/events/Route119_House.inc b/data/maps/Route119_House/events.inc
index 0b7bc6b70..0b7bc6b70 100644
--- a/data/maps/events/Route119_House.inc
+++ b/data/maps/Route119_House/events.inc
diff --git a/data/maps/events/Route119_WeatherInstitute_1F.inc b/data/maps/Route119_WeatherInstitute_1F/events.inc
index 0107020cd..0107020cd 100644
--- a/data/maps/events/Route119_WeatherInstitute_1F.inc
+++ b/data/maps/Route119_WeatherInstitute_1F/events.inc
diff --git a/data/maps/events/Route119_WeatherInstitute_2F.inc b/data/maps/Route119_WeatherInstitute_2F/events.inc
index 62cb0391f..62cb0391f 100644
--- a/data/maps/events/Route119_WeatherInstitute_2F.inc
+++ b/data/maps/Route119_WeatherInstitute_2F/events.inc
diff --git a/data/maps/events/Route120.inc b/data/maps/Route120/events.inc
index 1c0444b22..1c0444b22 100644
--- a/data/maps/events/Route120.inc
+++ b/data/maps/Route120/events.inc
diff --git a/data/maps/events/Route121.inc b/data/maps/Route121/events.inc
index 7405af540..7405af540 100644
--- a/data/maps/events/Route121.inc
+++ b/data/maps/Route121/events.inc
diff --git a/data/maps/events/Route121_SafariZoneEntrance.inc b/data/maps/Route121_SafariZoneEntrance/events.inc
index 6ed6613ec..6ed6613ec 100644
--- a/data/maps/events/Route121_SafariZoneEntrance.inc
+++ b/data/maps/Route121_SafariZoneEntrance/events.inc
diff --git a/data/maps/events/Route122.inc b/data/maps/Route122/events.inc
index 3bad2b895..3bad2b895 100644
--- a/data/maps/events/Route122.inc
+++ b/data/maps/Route122/events.inc
diff --git a/data/maps/events/Route123.inc b/data/maps/Route123/events.inc
index b25ec5c64..b25ec5c64 100644
--- a/data/maps/events/Route123.inc
+++ b/data/maps/Route123/events.inc
diff --git a/data/maps/events/Route123_BerryMastersHouse.inc b/data/maps/Route123_BerryMastersHouse/events.inc
index ff950e5cb..ff950e5cb 100644
--- a/data/maps/events/Route123_BerryMastersHouse.inc
+++ b/data/maps/Route123_BerryMastersHouse/events.inc
diff --git a/data/maps/events/Route124.inc b/data/maps/Route124/events.inc
index 694718fb6..694718fb6 100644
--- a/data/maps/events/Route124.inc
+++ b/data/maps/Route124/events.inc
diff --git a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc
index e165c9da8..e165c9da8 100644
--- a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc
+++ b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc
diff --git a/data/maps/events/Route125.inc b/data/maps/Route125/events.inc
index 8ad4ce22a..8ad4ce22a 100644
--- a/data/maps/events/Route125.inc
+++ b/data/maps/Route125/events.inc
diff --git a/data/maps/events/Route126.inc b/data/maps/Route126/events.inc
index f90152ea4..f90152ea4 100644
--- a/data/maps/events/Route126.inc
+++ b/data/maps/Route126/events.inc
diff --git a/data/maps/events/Route127.inc b/data/maps/Route127/events.inc
index 66078b122..66078b122 100644
--- a/data/maps/events/Route127.inc
+++ b/data/maps/Route127/events.inc
diff --git a/data/maps/events/Route128.inc b/data/maps/Route128/events.inc
index 9ea71c52e..9ea71c52e 100644
--- a/data/maps/events/Route128.inc
+++ b/data/maps/Route128/events.inc
diff --git a/data/maps/events/Route129.inc b/data/maps/Route129/events.inc
index e86dd6ce0..e86dd6ce0 100644
--- a/data/maps/events/Route129.inc
+++ b/data/maps/Route129/events.inc
diff --git a/data/maps/events/Route130.inc b/data/maps/Route130/events.inc
index f6770fa34..f6770fa34 100644
--- a/data/maps/events/Route130.inc
+++ b/data/maps/Route130/events.inc
diff --git a/data/maps/events/Route131.inc b/data/maps/Route131/events.inc
index 0d61e6f95..0d61e6f95 100644
--- a/data/maps/events/Route131.inc
+++ b/data/maps/Route131/events.inc
diff --git a/data/maps/events/Route132.inc b/data/maps/Route132/events.inc
index 167fbfd4b..167fbfd4b 100644
--- a/data/maps/events/Route132.inc
+++ b/data/maps/Route132/events.inc
diff --git a/data/maps/events/Route133.inc b/data/maps/Route133/events.inc
index d71755575..d71755575 100644
--- a/data/maps/events/Route133.inc
+++ b/data/maps/Route133/events.inc
diff --git a/data/maps/events/Route134.inc b/data/maps/Route134/events.inc
index b167d48b1..b167d48b1 100644
--- a/data/maps/events/Route134.inc
+++ b/data/maps/Route134/events.inc
diff --git a/data/maps/events/RustboroCity.inc b/data/maps/RustboroCity/events.inc
index bfc6cff77..bfc6cff77 100644
--- a/data/maps/events/RustboroCity.inc
+++ b/data/maps/RustboroCity/events.inc
diff --git a/data/maps/events/RustboroCity_CuttersHouse.inc b/data/maps/RustboroCity_CuttersHouse/events.inc
index 6a96e223c..6a96e223c 100644
--- a/data/maps/events/RustboroCity_CuttersHouse.inc
+++ b/data/maps/RustboroCity_CuttersHouse/events.inc
diff --git a/data/maps/events/RustboroCity_DevonCorp_1F.inc b/data/maps/RustboroCity_DevonCorp_1F/events.inc
index 5cfbd5134..5cfbd5134 100644
--- a/data/maps/events/RustboroCity_DevonCorp_1F.inc
+++ b/data/maps/RustboroCity_DevonCorp_1F/events.inc
diff --git a/data/maps/events/RustboroCity_DevonCorp_2F.inc b/data/maps/RustboroCity_DevonCorp_2F/events.inc
index 1babeffd7..1babeffd7 100644
--- a/data/maps/events/RustboroCity_DevonCorp_2F.inc
+++ b/data/maps/RustboroCity_DevonCorp_2F/events.inc
diff --git a/data/maps/events/RustboroCity_DevonCorp_3F.inc b/data/maps/RustboroCity_DevonCorp_3F/events.inc
index b77f343af..b77f343af 100644
--- a/data/maps/events/RustboroCity_DevonCorp_3F.inc
+++ b/data/maps/RustboroCity_DevonCorp_3F/events.inc
diff --git a/data/maps/events/RustboroCity_Flat1_1F.inc b/data/maps/RustboroCity_Flat1_1F/events.inc
index 22a262f47..22a262f47 100644
--- a/data/maps/events/RustboroCity_Flat1_1F.inc
+++ b/data/maps/RustboroCity_Flat1_1F/events.inc
diff --git a/data/maps/events/RustboroCity_Flat1_2F.inc b/data/maps/RustboroCity_Flat1_2F/events.inc
index e906fe011..e906fe011 100644
--- a/data/maps/events/RustboroCity_Flat1_2F.inc
+++ b/data/maps/RustboroCity_Flat1_2F/events.inc
diff --git a/data/maps/events/RustboroCity_Flat2_1F.inc b/data/maps/RustboroCity_Flat2_1F/events.inc
index 76ed3f04e..76ed3f04e 100644
--- a/data/maps/events/RustboroCity_Flat2_1F.inc
+++ b/data/maps/RustboroCity_Flat2_1F/events.inc
diff --git a/data/maps/events/RustboroCity_Flat2_2F.inc b/data/maps/RustboroCity_Flat2_2F/events.inc
index 3f56e718c..3f56e718c 100644
--- a/data/maps/events/RustboroCity_Flat2_2F.inc
+++ b/data/maps/RustboroCity_Flat2_2F/events.inc
diff --git a/data/maps/events/RustboroCity_Flat2_3F.inc b/data/maps/RustboroCity_Flat2_3F/events.inc
index ed3ef80e7..ed3ef80e7 100644
--- a/data/maps/events/RustboroCity_Flat2_3F.inc
+++ b/data/maps/RustboroCity_Flat2_3F/events.inc
diff --git a/data/maps/events/RustboroCity_Gym.inc b/data/maps/RustboroCity_Gym/events.inc
index 97b5a6627..97b5a6627 100644
--- a/data/maps/events/RustboroCity_Gym.inc
+++ b/data/maps/RustboroCity_Gym/events.inc
diff --git a/data/maps/events/RustboroCity_House1.inc b/data/maps/RustboroCity_House1/events.inc
index 5a8023d2f..5a8023d2f 100644
--- a/data/maps/events/RustboroCity_House1.inc
+++ b/data/maps/RustboroCity_House1/events.inc
diff --git a/data/maps/events/RustboroCity_House2.inc b/data/maps/RustboroCity_House2/events.inc
index 4a7a60f12..4a7a60f12 100644
--- a/data/maps/events/RustboroCity_House2.inc
+++ b/data/maps/RustboroCity_House2/events.inc
diff --git a/data/maps/events/RustboroCity_House3.inc b/data/maps/RustboroCity_House3/events.inc
index bdd17333c..bdd17333c 100644
--- a/data/maps/events/RustboroCity_House3.inc
+++ b/data/maps/RustboroCity_House3/events.inc
diff --git a/data/maps/events/RustboroCity_Mart.inc b/data/maps/RustboroCity_Mart/events.inc
index b39aec815..b39aec815 100644
--- a/data/maps/events/RustboroCity_Mart.inc
+++ b/data/maps/RustboroCity_Mart/events.inc
diff --git a/data/maps/events/RustboroCity_PokemonCenter_1F.inc b/data/maps/RustboroCity_PokemonCenter_1F/events.inc
index 7173fb49c..7173fb49c 100644
--- a/data/maps/events/RustboroCity_PokemonCenter_1F.inc
+++ b/data/maps/RustboroCity_PokemonCenter_1F/events.inc
diff --git a/data/maps/events/RustboroCity_PokemonCenter_2F.inc b/data/maps/RustboroCity_PokemonCenter_2F/events.inc
index bf5737d14..bf5737d14 100644
--- a/data/maps/events/RustboroCity_PokemonCenter_2F.inc
+++ b/data/maps/RustboroCity_PokemonCenter_2F/events.inc
diff --git a/data/maps/events/RustboroCity_PokemonSchool.inc b/data/maps/RustboroCity_PokemonSchool/events.inc
index fc3f934fa..fc3f934fa 100644
--- a/data/maps/events/RustboroCity_PokemonSchool.inc
+++ b/data/maps/RustboroCity_PokemonSchool/events.inc
diff --git a/data/maps/events/RusturfTunnel.inc b/data/maps/RusturfTunnel/events.inc
index 9dda724af..9dda724af 100644
--- a/data/maps/events/RusturfTunnel.inc
+++ b/data/maps/RusturfTunnel/events.inc
diff --git a/data/maps/events/SSTidalCorridor.inc b/data/maps/SSTidalCorridor/events.inc
index 0e034da5c..0e034da5c 100644
--- a/data/maps/events/SSTidalCorridor.inc
+++ b/data/maps/SSTidalCorridor/events.inc
diff --git a/data/maps/events/SSTidalLowerDeck.inc b/data/maps/SSTidalLowerDeck/events.inc
index c9cbf6715..c9cbf6715 100644
--- a/data/maps/events/SSTidalLowerDeck.inc
+++ b/data/maps/SSTidalLowerDeck/events.inc
diff --git a/data/maps/events/SSTidalRooms.inc b/data/maps/SSTidalRooms/events.inc
index e86c60ed6..e86c60ed6 100644
--- a/data/maps/events/SSTidalRooms.inc
+++ b/data/maps/SSTidalRooms/events.inc
diff --git a/data/maps/events/SafariZone_Northeast.inc b/data/maps/SafariZone_Northeast/events.inc
index ed750532f..ed750532f 100644
--- a/data/maps/events/SafariZone_Northeast.inc
+++ b/data/maps/SafariZone_Northeast/events.inc
diff --git a/data/maps/events/SafariZone_Northwest.inc b/data/maps/SafariZone_Northwest/events.inc
index 18a6db38e..18a6db38e 100644
--- a/data/maps/events/SafariZone_Northwest.inc
+++ b/data/maps/SafariZone_Northwest/events.inc
diff --git a/data/maps/events/SafariZone_RestHouse.inc b/data/maps/SafariZone_RestHouse/events.inc
index 8ed841ff1..8ed841ff1 100644
--- a/data/maps/events/SafariZone_RestHouse.inc
+++ b/data/maps/SafariZone_RestHouse/events.inc
diff --git a/data/maps/events/SafariZone_Southeast.inc b/data/maps/SafariZone_Southeast/events.inc
index a18b2b394..a18b2b394 100644
--- a/data/maps/events/SafariZone_Southeast.inc
+++ b/data/maps/SafariZone_Southeast/events.inc
diff --git a/data/maps/events/SafariZone_Southwest.inc b/data/maps/SafariZone_Southwest/events.inc
index 909997d64..909997d64 100644
--- a/data/maps/events/SafariZone_Southwest.inc
+++ b/data/maps/SafariZone_Southwest/events.inc
diff --git a/data/maps/events/ScorchedSlab.inc b/data/maps/ScorchedSlab/events.inc
index a90403222..a90403222 100644
--- a/data/maps/events/ScorchedSlab.inc
+++ b/data/maps/ScorchedSlab/events.inc
diff --git a/data/maps/events/SeafloorCavern_Entrance.inc b/data/maps/SeafloorCavern_Entrance/events.inc
index 4f6fa0c07..4f6fa0c07 100644
--- a/data/maps/events/SeafloorCavern_Entrance.inc
+++ b/data/maps/SeafloorCavern_Entrance/events.inc
diff --git a/data/maps/events/SeafloorCavern_Room1.inc b/data/maps/SeafloorCavern_Room1/events.inc
index cb6442135..cb6442135 100644
--- a/data/maps/events/SeafloorCavern_Room1.inc
+++ b/data/maps/SeafloorCavern_Room1/events.inc
diff --git a/data/maps/events/SeafloorCavern_Room2.inc b/data/maps/SeafloorCavern_Room2/events.inc
index eefcffd2e..eefcffd2e 100644
--- a/data/maps/events/SeafloorCavern_Room2.inc
+++ b/data/maps/SeafloorCavern_Room2/events.inc
diff --git a/data/maps/events/SeafloorCavern_Room3.inc b/data/maps/SeafloorCavern_Room3/events.inc
index 5f8f769d3..5f8f769d3 100644
--- a/data/maps/events/SeafloorCavern_Room3.inc
+++ b/data/maps/SeafloorCavern_Room3/events.inc
diff --git a/data/maps/events/SeafloorCavern_Room4.inc b/data/maps/SeafloorCavern_Room4/events.inc
index a31f0f5d8..a31f0f5d8 100644
--- a/data/maps/events/SeafloorCavern_Room4.inc
+++ b/data/maps/SeafloorCavern_Room4/events.inc
diff --git a/data/maps/events/SeafloorCavern_Room5.inc b/data/maps/SeafloorCavern_Room5/events.inc
index 767fa6dc1..767fa6dc1 100644
--- a/data/maps/events/SeafloorCavern_Room5.inc
+++ b/data/maps/SeafloorCavern_Room5/events.inc
diff --git a/data/maps/events/SeafloorCavern_Room6.inc b/data/maps/SeafloorCavern_Room6/events.inc
index adf36455a..adf36455a 100644
--- a/data/maps/events/SeafloorCavern_Room6.inc
+++ b/data/maps/SeafloorCavern_Room6/events.inc
diff --git a/data/maps/events/SeafloorCavern_Room7.inc b/data/maps/SeafloorCavern_Room7/events.inc
index 616376e32..616376e32 100644
--- a/data/maps/events/SeafloorCavern_Room7.inc
+++ b/data/maps/SeafloorCavern_Room7/events.inc
diff --git a/data/maps/events/SeafloorCavern_Room8.inc b/data/maps/SeafloorCavern_Room8/events.inc
index 450eb894a..450eb894a 100644
--- a/data/maps/events/SeafloorCavern_Room8.inc
+++ b/data/maps/SeafloorCavern_Room8/events.inc
diff --git a/data/maps/events/SeafloorCavern_Room9.inc b/data/maps/SeafloorCavern_Room9/events.inc
index f4efdbcc0..f4efdbcc0 100644
--- a/data/maps/events/SeafloorCavern_Room9.inc
+++ b/data/maps/SeafloorCavern_Room9/events.inc
diff --git a/data/maps/events/SealedChamber_InnerRoom.inc b/data/maps/SealedChamber_InnerRoom/events.inc
index a457a4e03..a457a4e03 100644
--- a/data/maps/events/SealedChamber_InnerRoom.inc
+++ b/data/maps/SealedChamber_InnerRoom/events.inc
diff --git a/data/maps/events/SealedChamber_OuterRoom.inc b/data/maps/SealedChamber_OuterRoom/events.inc
index 634f41f60..634f41f60 100644
--- a/data/maps/events/SealedChamber_OuterRoom.inc
+++ b/data/maps/SealedChamber_OuterRoom/events.inc
diff --git a/data/maps/events/SecretBase_BlueCave1.inc b/data/maps/SecretBase_BlueCave1/events.inc
index 7f883e7e9..7f883e7e9 100644
--- a/data/maps/events/SecretBase_BlueCave1.inc
+++ b/data/maps/SecretBase_BlueCave1/events.inc
diff --git a/data/maps/events/SecretBase_BlueCave2.inc b/data/maps/SecretBase_BlueCave2/events.inc
index 93e7b67f8..93e7b67f8 100644
--- a/data/maps/events/SecretBase_BlueCave2.inc
+++ b/data/maps/SecretBase_BlueCave2/events.inc
diff --git a/data/maps/events/SecretBase_BlueCave3.inc b/data/maps/SecretBase_BlueCave3/events.inc
index bb761d2e8..bb761d2e8 100644
--- a/data/maps/events/SecretBase_BlueCave3.inc
+++ b/data/maps/SecretBase_BlueCave3/events.inc
diff --git a/data/maps/events/SecretBase_BlueCave4.inc b/data/maps/SecretBase_BlueCave4/events.inc
index 082600bec..082600bec 100644
--- a/data/maps/events/SecretBase_BlueCave4.inc
+++ b/data/maps/SecretBase_BlueCave4/events.inc
diff --git a/data/maps/events/SecretBase_BrownCave1.inc b/data/maps/SecretBase_BrownCave1/events.inc
index c3219bf43..c3219bf43 100644
--- a/data/maps/events/SecretBase_BrownCave1.inc
+++ b/data/maps/SecretBase_BrownCave1/events.inc
diff --git a/data/maps/events/SecretBase_BrownCave2.inc b/data/maps/SecretBase_BrownCave2/events.inc
index e57348a00..e57348a00 100644
--- a/data/maps/events/SecretBase_BrownCave2.inc
+++ b/data/maps/SecretBase_BrownCave2/events.inc
diff --git a/data/maps/events/SecretBase_BrownCave3.inc b/data/maps/SecretBase_BrownCave3/events.inc
index c1003816a..c1003816a 100644
--- a/data/maps/events/SecretBase_BrownCave3.inc
+++ b/data/maps/SecretBase_BrownCave3/events.inc
diff --git a/data/maps/events/SecretBase_BrownCave4.inc b/data/maps/SecretBase_BrownCave4/events.inc
index 02afc20c4..02afc20c4 100644
--- a/data/maps/events/SecretBase_BrownCave4.inc
+++ b/data/maps/SecretBase_BrownCave4/events.inc
diff --git a/data/maps/events/SecretBase_RedCave1.inc b/data/maps/SecretBase_RedCave1/events.inc
index 18fea4c40..18fea4c40 100644
--- a/data/maps/events/SecretBase_RedCave1.inc
+++ b/data/maps/SecretBase_RedCave1/events.inc
diff --git a/data/maps/events/SecretBase_RedCave2.inc b/data/maps/SecretBase_RedCave2/events.inc
index 1d9bdde09..1d9bdde09 100644
--- a/data/maps/events/SecretBase_RedCave2.inc
+++ b/data/maps/SecretBase_RedCave2/events.inc
diff --git a/data/maps/events/SecretBase_RedCave3.inc b/data/maps/SecretBase_RedCave3/events.inc
index 923616945..923616945 100644
--- a/data/maps/events/SecretBase_RedCave3.inc
+++ b/data/maps/SecretBase_RedCave3/events.inc
diff --git a/data/maps/events/SecretBase_RedCave4.inc b/data/maps/SecretBase_RedCave4/events.inc
index 25a0f2ec6..25a0f2ec6 100644
--- a/data/maps/events/SecretBase_RedCave4.inc
+++ b/data/maps/SecretBase_RedCave4/events.inc
diff --git a/data/maps/events/SecretBase_Shrub1.inc b/data/maps/SecretBase_Shrub1/events.inc
index e1583e86d..e1583e86d 100644
--- a/data/maps/events/SecretBase_Shrub1.inc
+++ b/data/maps/SecretBase_Shrub1/events.inc
diff --git a/data/maps/events/SecretBase_Shrub2.inc b/data/maps/SecretBase_Shrub2/events.inc
index 72bdcc380..72bdcc380 100644
--- a/data/maps/events/SecretBase_Shrub2.inc
+++ b/data/maps/SecretBase_Shrub2/events.inc
diff --git a/data/maps/events/SecretBase_Shrub3.inc b/data/maps/SecretBase_Shrub3/events.inc
index b09c206e7..b09c206e7 100644
--- a/data/maps/events/SecretBase_Shrub3.inc
+++ b/data/maps/SecretBase_Shrub3/events.inc
diff --git a/data/maps/events/SecretBase_Shrub4.inc b/data/maps/SecretBase_Shrub4/events.inc
index a9f636e54..a9f636e54 100644
--- a/data/maps/events/SecretBase_Shrub4.inc
+++ b/data/maps/SecretBase_Shrub4/events.inc
diff --git a/data/maps/events/SecretBase_Tree1.inc b/data/maps/SecretBase_Tree1/events.inc
index 467789f32..467789f32 100644
--- a/data/maps/events/SecretBase_Tree1.inc
+++ b/data/maps/SecretBase_Tree1/events.inc
diff --git a/data/maps/events/SecretBase_Tree2.inc b/data/maps/SecretBase_Tree2/events.inc
index ef2280e01..ef2280e01 100644
--- a/data/maps/events/SecretBase_Tree2.inc
+++ b/data/maps/SecretBase_Tree2/events.inc
diff --git a/data/maps/events/SecretBase_Tree3.inc b/data/maps/SecretBase_Tree3/events.inc
index 25bc95466..25bc95466 100644
--- a/data/maps/events/SecretBase_Tree3.inc
+++ b/data/maps/SecretBase_Tree3/events.inc
diff --git a/data/maps/events/SecretBase_Tree4.inc b/data/maps/SecretBase_Tree4/events.inc
index 6f0e5b3b5..6f0e5b3b5 100644
--- a/data/maps/events/SecretBase_Tree4.inc
+++ b/data/maps/SecretBase_Tree4/events.inc
diff --git a/data/maps/events/SecretBase_YellowCave1.inc b/data/maps/SecretBase_YellowCave1/events.inc
index 930cbc21d..930cbc21d 100644
--- a/data/maps/events/SecretBase_YellowCave1.inc
+++ b/data/maps/SecretBase_YellowCave1/events.inc
diff --git a/data/maps/events/SecretBase_YellowCave2.inc b/data/maps/SecretBase_YellowCave2/events.inc
index fd3e265e5..fd3e265e5 100644
--- a/data/maps/events/SecretBase_YellowCave2.inc
+++ b/data/maps/SecretBase_YellowCave2/events.inc
diff --git a/data/maps/events/SecretBase_YellowCave3.inc b/data/maps/SecretBase_YellowCave3/events.inc
index 99f0ae8b4..99f0ae8b4 100644
--- a/data/maps/events/SecretBase_YellowCave3.inc
+++ b/data/maps/SecretBase_YellowCave3/events.inc
diff --git a/data/maps/events/SecretBase_YellowCave4.inc b/data/maps/SecretBase_YellowCave4/events.inc
index af59e0067..af59e0067 100644
--- a/data/maps/events/SecretBase_YellowCave4.inc
+++ b/data/maps/SecretBase_YellowCave4/events.inc
diff --git a/data/maps/events/ShoalCave_HighTideEntranceRoom.inc b/data/maps/ShoalCave_HighTideEntranceRoom/events.inc
index c7225843f..c7225843f 100644
--- a/data/maps/events/ShoalCave_HighTideEntranceRoom.inc
+++ b/data/maps/ShoalCave_HighTideEntranceRoom/events.inc
diff --git a/data/maps/events/ShoalCave_HighTideInnerRoom.inc b/data/maps/ShoalCave_HighTideInnerRoom/events.inc
index e7951742a..e7951742a 100644
--- a/data/maps/events/ShoalCave_HighTideInnerRoom.inc
+++ b/data/maps/ShoalCave_HighTideInnerRoom/events.inc
diff --git a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc
index fe4a2eae9..fe4a2eae9 100644
--- a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc
+++ b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc
diff --git a/data/maps/events/ShoalCave_LowTideIceRoom.inc b/data/maps/ShoalCave_LowTideIceRoom/events.inc
index 87d291c40..87d291c40 100644
--- a/data/maps/events/ShoalCave_LowTideIceRoom.inc
+++ b/data/maps/ShoalCave_LowTideIceRoom/events.inc
diff --git a/data/maps/events/ShoalCave_LowTideInnerRoom.inc b/data/maps/ShoalCave_LowTideInnerRoom/events.inc
index 746f36cdc..746f36cdc 100644
--- a/data/maps/events/ShoalCave_LowTideInnerRoom.inc
+++ b/data/maps/ShoalCave_LowTideInnerRoom/events.inc
diff --git a/data/maps/events/ShoalCave_LowTideLowerRoom.inc b/data/maps/ShoalCave_LowTideLowerRoom/events.inc
index 6ff9a44b3..6ff9a44b3 100644
--- a/data/maps/events/ShoalCave_LowTideLowerRoom.inc
+++ b/data/maps/ShoalCave_LowTideLowerRoom/events.inc
diff --git a/data/maps/events/ShoalCave_LowTideStairsRoom.inc b/data/maps/ShoalCave_LowTideStairsRoom/events.inc
index 65570d256..65570d256 100644
--- a/data/maps/events/ShoalCave_LowTideStairsRoom.inc
+++ b/data/maps/ShoalCave_LowTideStairsRoom/events.inc
diff --git a/data/maps/events/SingleBattleColosseum.inc b/data/maps/SingleBattleColosseum/events.inc
index e6da2e027..e6da2e027 100644
--- a/data/maps/events/SingleBattleColosseum.inc
+++ b/data/maps/SingleBattleColosseum/events.inc
diff --git a/data/maps/events/SkyPillar_1F.inc b/data/maps/SkyPillar_1F/events.inc
index 2af7aaa76..2af7aaa76 100644
--- a/data/maps/events/SkyPillar_1F.inc
+++ b/data/maps/SkyPillar_1F/events.inc
diff --git a/data/maps/events/SkyPillar_2F.inc b/data/maps/SkyPillar_2F/events.inc
index 48fcb9fec..48fcb9fec 100644
--- a/data/maps/events/SkyPillar_2F.inc
+++ b/data/maps/SkyPillar_2F/events.inc
diff --git a/data/maps/events/SkyPillar_3F.inc b/data/maps/SkyPillar_3F/events.inc
index 4aeda3339..4aeda3339 100644
--- a/data/maps/events/SkyPillar_3F.inc
+++ b/data/maps/SkyPillar_3F/events.inc
diff --git a/data/maps/events/SkyPillar_4F.inc b/data/maps/SkyPillar_4F/events.inc
index 3e908ed74..3e908ed74 100644
--- a/data/maps/events/SkyPillar_4F.inc
+++ b/data/maps/SkyPillar_4F/events.inc
diff --git a/data/maps/events/SkyPillar_5F.inc b/data/maps/SkyPillar_5F/events.inc
index badae77af..badae77af 100644
--- a/data/maps/events/SkyPillar_5F.inc
+++ b/data/maps/SkyPillar_5F/events.inc
diff --git a/data/maps/events/SkyPillar_Entrance.inc b/data/maps/SkyPillar_Entrance/events.inc
index 904b3b9ae..904b3b9ae 100644
--- a/data/maps/events/SkyPillar_Entrance.inc
+++ b/data/maps/SkyPillar_Entrance/events.inc
diff --git a/data/maps/events/SkyPillar_Outside.inc b/data/maps/SkyPillar_Outside/events.inc
index 120cd982b..120cd982b 100644
--- a/data/maps/events/SkyPillar_Outside.inc
+++ b/data/maps/SkyPillar_Outside/events.inc
diff --git a/data/maps/events/SkyPillar_Top.inc b/data/maps/SkyPillar_Top/events.inc
index 9fc989c78..9fc989c78 100644
--- a/data/maps/events/SkyPillar_Top.inc
+++ b/data/maps/SkyPillar_Top/events.inc
diff --git a/data/maps/events/SlateportCity.inc b/data/maps/SlateportCity/events.inc
index 685bc7359..685bc7359 100644
--- a/data/maps/events/SlateportCity.inc
+++ b/data/maps/SlateportCity/events.inc
diff --git a/data/maps/events/SlateportCity_ContestHall.inc b/data/maps/SlateportCity_ContestHall/events.inc
index b2a57ccc9..b2a57ccc9 100644
--- a/data/maps/events/SlateportCity_ContestHall.inc
+++ b/data/maps/SlateportCity_ContestHall/events.inc
diff --git a/data/maps/events/SlateportCity_ContestLobby.inc b/data/maps/SlateportCity_ContestLobby/events.inc
index 8981bf455..8981bf455 100644
--- a/data/maps/events/SlateportCity_ContestLobby.inc
+++ b/data/maps/SlateportCity_ContestLobby/events.inc
diff --git a/data/maps/events/SlateportCity_Harbor.inc b/data/maps/SlateportCity_Harbor/events.inc
index a7581ab2a..a7581ab2a 100644
--- a/data/maps/events/SlateportCity_Harbor.inc
+++ b/data/maps/SlateportCity_Harbor/events.inc
diff --git a/data/maps/events/SlateportCity_House1.inc b/data/maps/SlateportCity_House1/events.inc
index bc83e91ce..bc83e91ce 100644
--- a/data/maps/events/SlateportCity_House1.inc
+++ b/data/maps/SlateportCity_House1/events.inc
diff --git a/data/maps/events/SlateportCity_House2.inc b/data/maps/SlateportCity_House2/events.inc
index d115e8225..d115e8225 100644
--- a/data/maps/events/SlateportCity_House2.inc
+++ b/data/maps/SlateportCity_House2/events.inc
diff --git a/data/maps/events/SlateportCity_Mart.inc b/data/maps/SlateportCity_Mart/events.inc
index abf6ebdce..abf6ebdce 100644
--- a/data/maps/events/SlateportCity_Mart.inc
+++ b/data/maps/SlateportCity_Mart/events.inc
diff --git a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc
index 825c589de..825c589de 100644
--- a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc
diff --git a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc
index bb52f2403..bb52f2403 100644
--- a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc
diff --git a/data/maps/events/SlateportCity_PokemonCenter_1F.inc b/data/maps/SlateportCity_PokemonCenter_1F/events.inc
index d4d9ab405..d4d9ab405 100644
--- a/data/maps/events/SlateportCity_PokemonCenter_1F.inc
+++ b/data/maps/SlateportCity_PokemonCenter_1F/events.inc
diff --git a/data/maps/events/SlateportCity_PokemonCenter_2F.inc b/data/maps/SlateportCity_PokemonCenter_2F/events.inc
index df2da68bb..df2da68bb 100644
--- a/data/maps/events/SlateportCity_PokemonCenter_2F.inc
+++ b/data/maps/SlateportCity_PokemonCenter_2F/events.inc
diff --git a/data/maps/events/SlateportCity_PokemonFanClub.inc b/data/maps/SlateportCity_PokemonFanClub/events.inc
index 55b0a693d..55b0a693d 100644
--- a/data/maps/events/SlateportCity_PokemonFanClub.inc
+++ b/data/maps/SlateportCity_PokemonFanClub/events.inc
diff --git a/data/maps/events/SlateportCity_SternsShipyard_1F.inc b/data/maps/SlateportCity_SternsShipyard_1F/events.inc
index cd5c7c25b..cd5c7c25b 100644
--- a/data/maps/events/SlateportCity_SternsShipyard_1F.inc
+++ b/data/maps/SlateportCity_SternsShipyard_1F/events.inc
diff --git a/data/maps/events/SlateportCity_SternsShipyard_2F.inc b/data/maps/SlateportCity_SternsShipyard_2F/events.inc
index aa5c02e40..aa5c02e40 100644
--- a/data/maps/events/SlateportCity_SternsShipyard_2F.inc
+++ b/data/maps/SlateportCity_SternsShipyard_2F/events.inc
diff --git a/data/maps/events/SootopolisCity.inc b/data/maps/SootopolisCity/events.inc
index cb793ea47..cb793ea47 100644
--- a/data/maps/events/SootopolisCity.inc
+++ b/data/maps/SootopolisCity/events.inc
diff --git a/data/maps/events/SootopolisCity_Gym_1F.inc b/data/maps/SootopolisCity_Gym_1F/events.inc
index 43cd0fe75..43cd0fe75 100644
--- a/data/maps/events/SootopolisCity_Gym_1F.inc
+++ b/data/maps/SootopolisCity_Gym_1F/events.inc
diff --git a/data/maps/events/SootopolisCity_Gym_B1F.inc b/data/maps/SootopolisCity_Gym_B1F/events.inc
index 9ccf07ef6..9ccf07ef6 100644
--- a/data/maps/events/SootopolisCity_Gym_B1F.inc
+++ b/data/maps/SootopolisCity_Gym_B1F/events.inc
diff --git a/data/maps/events/SootopolisCity_House1.inc b/data/maps/SootopolisCity_House1/events.inc
index a4b4c7932..a4b4c7932 100644
--- a/data/maps/events/SootopolisCity_House1.inc
+++ b/data/maps/SootopolisCity_House1/events.inc
diff --git a/data/maps/events/SootopolisCity_House2.inc b/data/maps/SootopolisCity_House2/events.inc
index 146a1d871..146a1d871 100644
--- a/data/maps/events/SootopolisCity_House2.inc
+++ b/data/maps/SootopolisCity_House2/events.inc
diff --git a/data/maps/events/SootopolisCity_House3.inc b/data/maps/SootopolisCity_House3/events.inc
index d813189e8..d813189e8 100644
--- a/data/maps/events/SootopolisCity_House3.inc
+++ b/data/maps/SootopolisCity_House3/events.inc
diff --git a/data/maps/events/SootopolisCity_House4.inc b/data/maps/SootopolisCity_House4/events.inc
index 128d0ff99..128d0ff99 100644
--- a/data/maps/events/SootopolisCity_House4.inc
+++ b/data/maps/SootopolisCity_House4/events.inc
diff --git a/data/maps/events/SootopolisCity_House5.inc b/data/maps/SootopolisCity_House5/events.inc
index 2217f3e0f..2217f3e0f 100644
--- a/data/maps/events/SootopolisCity_House5.inc
+++ b/data/maps/SootopolisCity_House5/events.inc
diff --git a/data/maps/events/SootopolisCity_House6.inc b/data/maps/SootopolisCity_House6/events.inc
index a189b98ba..a189b98ba 100644
--- a/data/maps/events/SootopolisCity_House6.inc
+++ b/data/maps/SootopolisCity_House6/events.inc
diff --git a/data/maps/events/SootopolisCity_House7.inc b/data/maps/SootopolisCity_House7/events.inc
index 39bc71e79..39bc71e79 100644
--- a/data/maps/events/SootopolisCity_House7.inc
+++ b/data/maps/SootopolisCity_House7/events.inc
diff --git a/data/maps/events/SootopolisCity_House8.inc b/data/maps/SootopolisCity_House8/events.inc
index d6b139f34..d6b139f34 100644
--- a/data/maps/events/SootopolisCity_House8.inc
+++ b/data/maps/SootopolisCity_House8/events.inc
diff --git a/data/maps/events/SootopolisCity_Mart.inc b/data/maps/SootopolisCity_Mart/events.inc
index 38d3f30f0..38d3f30f0 100644
--- a/data/maps/events/SootopolisCity_Mart.inc
+++ b/data/maps/SootopolisCity_Mart/events.inc
diff --git a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc
index 8852ba87c..8852ba87c 100644
--- a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc
diff --git a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc
index 2b6b7a022..2b6b7a022 100644
--- a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc
diff --git a/data/maps/events/SouthernIsland_Exterior.inc b/data/maps/SouthernIsland_Exterior/events.inc
index 38ff07de5..38ff07de5 100644
--- a/data/maps/events/SouthernIsland_Exterior.inc
+++ b/data/maps/SouthernIsland_Exterior/events.inc
diff --git a/data/maps/events/SouthernIsland_Interior.inc b/data/maps/SouthernIsland_Interior/events.inc
index cba468ef7..cba468ef7 100644
--- a/data/maps/events/SouthernIsland_Interior.inc
+++ b/data/maps/SouthernIsland_Interior/events.inc
diff --git a/data/maps/events/TradeCenter.inc b/data/maps/TradeCenter/events.inc
index bb69d402e..bb69d402e 100644
--- a/data/maps/events/TradeCenter.inc
+++ b/data/maps/TradeCenter/events.inc
diff --git a/data/maps/events/Underwater1.inc b/data/maps/Underwater1/events.inc
index 12b3cf72b..12b3cf72b 100644
--- a/data/maps/events/Underwater1.inc
+++ b/data/maps/Underwater1/events.inc
diff --git a/data/maps/events/Underwater2.inc b/data/maps/Underwater2/events.inc
index a628cf972..a628cf972 100644
--- a/data/maps/events/Underwater2.inc
+++ b/data/maps/Underwater2/events.inc
diff --git a/data/maps/events/Underwater3.inc b/data/maps/Underwater3/events.inc
index 62518bafa..62518bafa 100644
--- a/data/maps/events/Underwater3.inc
+++ b/data/maps/Underwater3/events.inc
diff --git a/data/maps/events/Underwater4.inc b/data/maps/Underwater4/events.inc
index fad99382b..fad99382b 100644
--- a/data/maps/events/Underwater4.inc
+++ b/data/maps/Underwater4/events.inc
diff --git a/data/maps/events/Underwater_Route134.inc b/data/maps/Underwater_Route134/events.inc
index 6dc462c80..6dc462c80 100644
--- a/data/maps/events/Underwater_Route134.inc
+++ b/data/maps/Underwater_Route134/events.inc
diff --git a/data/maps/events/Underwater_SeafloorCavern.inc b/data/maps/Underwater_SeafloorCavern/events.inc
index 3b1798716..3b1798716 100644
--- a/data/maps/events/Underwater_SeafloorCavern.inc
+++ b/data/maps/Underwater_SeafloorCavern/events.inc
diff --git a/data/maps/events/Underwater_SealedChamber.inc b/data/maps/Underwater_SealedChamber/events.inc
index ede501142..ede501142 100644
--- a/data/maps/events/Underwater_SealedChamber.inc
+++ b/data/maps/Underwater_SealedChamber/events.inc
diff --git a/data/maps/events/Underwater_SootopolisCity.inc b/data/maps/Underwater_SootopolisCity/events.inc
index f745dc557..f745dc557 100644
--- a/data/maps/events/Underwater_SootopolisCity.inc
+++ b/data/maps/Underwater_SootopolisCity/events.inc
diff --git a/data/maps/events/UnknownMap_25_29.inc b/data/maps/UnknownMap_25_29/events.inc
index 5f3412382..5f3412382 100644
--- a/data/maps/events/UnknownMap_25_29.inc
+++ b/data/maps/UnknownMap_25_29/events.inc
diff --git a/data/maps/events/UnknownMap_25_30.inc b/data/maps/UnknownMap_25_30/events.inc
index 8ce359a0b..8ce359a0b 100644
--- a/data/maps/events/UnknownMap_25_30.inc
+++ b/data/maps/UnknownMap_25_30/events.inc
diff --git a/data/maps/events/UnknownMap_25_31.inc b/data/maps/UnknownMap_25_31/events.inc
index f2eabe57f..f2eabe57f 100644
--- a/data/maps/events/UnknownMap_25_31.inc
+++ b/data/maps/UnknownMap_25_31/events.inc
diff --git a/data/maps/events/UnknownMap_25_32.inc b/data/maps/UnknownMap_25_32/events.inc
index aa0435850..aa0435850 100644
--- a/data/maps/events/UnknownMap_25_32.inc
+++ b/data/maps/UnknownMap_25_32/events.inc
diff --git a/data/maps/events/UnknownMap_25_33.inc b/data/maps/UnknownMap_25_33/events.inc
index db91b6ef5..db91b6ef5 100644
--- a/data/maps/events/UnknownMap_25_33.inc
+++ b/data/maps/UnknownMap_25_33/events.inc
diff --git a/data/maps/events/UnknownMap_25_34.inc b/data/maps/UnknownMap_25_34/events.inc
index 7cca882bc..7cca882bc 100644
--- a/data/maps/events/UnknownMap_25_34.inc
+++ b/data/maps/UnknownMap_25_34/events.inc
diff --git a/data/maps/events/VerdanturfTown.inc b/data/maps/VerdanturfTown/events.inc
index 920703b72..920703b72 100644
--- a/data/maps/events/VerdanturfTown.inc
+++ b/data/maps/VerdanturfTown/events.inc
diff --git a/data/maps/events/VerdanturfTown_ContestHall.inc b/data/maps/VerdanturfTown_ContestHall/events.inc
index 78224364f..78224364f 100644
--- a/data/maps/events/VerdanturfTown_ContestHall.inc
+++ b/data/maps/VerdanturfTown_ContestHall/events.inc
diff --git a/data/maps/events/VerdanturfTown_ContestLobby.inc b/data/maps/VerdanturfTown_ContestLobby/events.inc
index 3ab316792..3ab316792 100644
--- a/data/maps/events/VerdanturfTown_ContestLobby.inc
+++ b/data/maps/VerdanturfTown_ContestLobby/events.inc
diff --git a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc
index c03706d90..c03706d90 100644
--- a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc
+++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc
diff --git a/data/maps/events/VerdanturfTown_House.inc b/data/maps/VerdanturfTown_House/events.inc
index ca7d2a4dd..ca7d2a4dd 100644
--- a/data/maps/events/VerdanturfTown_House.inc
+++ b/data/maps/VerdanturfTown_House/events.inc
diff --git a/data/maps/events/VerdanturfTown_Mart.inc b/data/maps/VerdanturfTown_Mart/events.inc
index f4ca8b8f3..f4ca8b8f3 100644
--- a/data/maps/events/VerdanturfTown_Mart.inc
+++ b/data/maps/VerdanturfTown_Mart/events.inc
diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc
index 8cf8b1dab..8cf8b1dab 100644
--- a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc
diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc
index 51fe22275..51fe22275 100644
--- a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc
diff --git a/data/maps/events/VerdanturfTown_WandasHouse.inc b/data/maps/VerdanturfTown_WandasHouse/events.inc
index 709c5aeb6..709c5aeb6 100644
--- a/data/maps/events/VerdanturfTown_WandasHouse.inc
+++ b/data/maps/VerdanturfTown_WandasHouse/events.inc
diff --git a/data/maps/events/VictoryRoad_1F.inc b/data/maps/VictoryRoad_1F/events.inc
index 916e9bfc2..916e9bfc2 100644
--- a/data/maps/events/VictoryRoad_1F.inc
+++ b/data/maps/VictoryRoad_1F/events.inc
diff --git a/data/maps/events/VictoryRoad_B1F.inc b/data/maps/VictoryRoad_B1F/events.inc
index af5c86254..af5c86254 100644
--- a/data/maps/events/VictoryRoad_B1F.inc
+++ b/data/maps/VictoryRoad_B1F/events.inc
diff --git a/data/maps/events/VictoryRoad_B2F.inc b/data/maps/VictoryRoad_B2F/events.inc
index b482e6f04..b482e6f04 100644
--- a/data/maps/events/VictoryRoad_B2F.inc
+++ b/data/maps/VictoryRoad_B2F/events.inc
diff --git a/data/maps/_groups.inc b/data/maps/groups.inc
index 478f03e86..478f03e86 100644
--- a/data/maps/_groups.inc
+++ b/data/maps/groups.inc